diff --git a/pkgs/by-name/fl/flclash/package.nix b/pkgs/by-name/fl/flclash/package.nix index 807b3dba5f57..dfe911fd2de5 100644 --- a/pkgs/by-name/fl/flclash/package.nix +++ b/pkgs/by-name/fl/flclash/package.nix @@ -1,7 +1,7 @@ { lib, fetchFromGitHub, - flutter332, + flutter335, keybinder3, libayatana-appindicator, buildGoModule, @@ -12,14 +12,14 @@ let pname = "flclash"; - version = "0.8.87"; + version = "0.8.90"; src = (fetchFromGitHub { owner = "chen08209"; repo = "FlClash"; tag = "v${version}"; - hash = "sha256-vGRq9Kc6XU6r3huIGAKoh5x46fFS8jmXgus9WgpvG3A="; + hash = "sha256-wEgWjzdP7HeWgDacaP9fYNczG9BrTN790AQ5aj9scwM="; fetchSubmodules = true; }).overrideAttrs (_: { @@ -28,20 +28,20 @@ let GIT_CONFIG_VALUE_0 = "git@github.com:"; }); - metaCommon = { - description = "Multi-platform proxy client based on ClashMeta, simple and easy to use, open-source and ad-free"; + meta = { + description = "Proxy client based on ClashMeta, simple and easy to use"; homepage = "https://github.com/chen08209/FlClash"; license = with lib.licenses; [ gpl3Plus ]; maintainers = [ ]; }; - libclash = buildGoModule { - inherit version src; - pname = "libclash"; + core = buildGoModule { + pname = "core"; + inherit version src meta; modRoot = "core"; - vendorHash = "sha256-Uc+RvpW3vndPFnM7yhqrNTEexAPaolCk8YK8u/+55RQ="; + vendorHash = "sha256-5oYJMcyKh8CpMLOLch5/svwa148hY4rnSR5inTRNK4M="; env.CGO_ENABLED = 0; @@ -53,11 +53,9 @@ let runHook postBuild ''; - - meta = metaCommon; }; in -flutter332.buildFlutterApplication { +flutter335.buildFlutterApplication { inherit pname version src; pubspecLock = lib.importJSON ./pubspec.lock.json; @@ -98,19 +96,19 @@ flutter332.buildFlutterApplication { preBuild = '' mkdir -p libclash/linux - cp ${libclash}/bin/FlClashCore libclash/linux/FlClashCore + cp ${core}/bin/FlClashCore libclash/linux/FlClashCore ''; postInstall = '' - install -Dm644 assets/images/icon.png $out/share/pixmaps/flclash.png + install -D --mode=0644 assets/images/icon.png $out/share/pixmaps/flclash.png ''; passthru = { - inherit libclash; + inherit core; updateScript = ./update.sh; }; - meta = metaCommon // { + meta = meta // { mainProgram = "FlClash"; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/fl/flclash/pubspec.lock.json b/pkgs/by-name/fl/flclash/pubspec.lock.json index bb49e16c8c88..dfa865af4231 100644 --- a/pkgs/by-name/fl/flclash/pubspec.lock.json +++ b/pkgs/by-name/fl/flclash/pubspec.lock.json @@ -4,31 +4,41 @@ "dependency": "transitive", "description": { "name": "_fe_analyzer_shared", - "sha256": "dc27559385e905ad30838356c5f5d574014ba39872d732111cd07ac0beff4c57", + "sha256": "da0d9209ca76bde579f2da330aeb9df62b6319c834fa7baae052021b0462401f", "url": "https://pub.dev" }, "source": "hosted", - "version": "80.0.0" + "version": "85.0.0" }, "analyzer": { "dependency": "transitive", "description": { "name": "analyzer", - "sha256": "192d1c5b944e7e53b24b5586db760db934b177d4147c42fbca8c8c5f1eb8d11e", + "sha256": "f4ad0fea5f102201015c9aae9d93bc02f75dd9491529a8c21f88d17a8523d44c", "url": "https://pub.dev" }, "source": "hosted", - "version": "7.3.0" + "version": "7.6.0" + }, + "analyzer_buffer": { + "dependency": "transitive", + "description": { + "name": "analyzer_buffer", + "sha256": "f7833bee67c03c37241c67f8741b17cc501b69d9758df7a5a4a13ed6c947be43", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.10" }, "analyzer_plugin": { "dependency": "transitive", "description": { "name": "analyzer_plugin", - "sha256": "1d460d14e3c2ae36dc2b32cef847c4479198cf87704f63c3c3c8150ee50c3916", + "sha256": "a5ab7590c27b779f3d4de67f31c4109dbe13dd7339f86461a6f2a8ab2594d8ce", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.12.0" + "version": "0.13.4" }, "animations": { "dependency": "direct main", @@ -44,11 +54,11 @@ "dependency": "direct main", "description": { "name": "app_links", - "sha256": "85ed8fc1d25a76475914fff28cc994653bd900bc2c26e4b57a49e097febb54ba", + "sha256": "5f88447519add627fe1cbcab4fd1da3d4fed15b9baf29f28b22535c95ecee3e8", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.4.0" + "version": "6.4.1" }, "app_links_linux": { "dependency": "transitive", @@ -84,11 +94,11 @@ "dependency": "direct main", "description": { "name": "archive", - "sha256": "cb6a278ef2dbb298455e1a713bda08524a175630ec643a242c399c932a0a1f7d", + "sha256": "2fde1607386ab523f7a36bb3e7edb43bd58e6edaf2ffb29d8a6d578b297fdbbd", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.6.1" + "version": "4.0.7" }, "args": { "dependency": "direct dev", @@ -124,21 +134,21 @@ "dependency": "transitive", "description": { "name": "build", - "sha256": "cef23f1eda9b57566c81e2133d196f8e3df48f244b317368d65c5943d91148f0", + "sha256": "ce76b1d48875e3233fde17717c23d1f60a91cc631597e49a400c89b475395b1d", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.2" + "version": "3.1.0" }, "build_config": { "dependency": "transitive", "description": { "name": "build_config", - "sha256": "4ae2de3e1e67ea270081eaee972e1bd8f027d459f249e0f1186730784c2e7e33", + "sha256": "4f64382b97504dc2fcdf487d5aae33418e08b4703fc21249e4db6d804a4d0187", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.2" + "version": "1.2.0" }, "build_daemon": { "dependency": "transitive", @@ -154,31 +164,31 @@ "dependency": "transitive", "description": { "name": "build_resolvers", - "sha256": "b9e4fda21d846e192628e7a4f6deda6888c36b5b69ba02ff291a01fd529140f0", + "sha256": "d1d57f7807debd7349b4726a19fd32ec8bc177c71ad0febf91a20f84cd2d4b46", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.4" + "version": "3.0.3" }, "build_runner": { "dependency": "direct dev", "description": { "name": "build_runner", - "sha256": "058fe9dce1de7d69c4b84fada934df3e0153dd000758c4d65964d0166779aa99", + "sha256": "b24597fceb695969d47025c958f3837f9f0122e237c6a22cb082a5ac66c3ca30", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.15" + "version": "2.7.1" }, "build_runner_core": { "dependency": "transitive", "description": { "name": "build_runner_core", - "sha256": "22e3aa1c80e0ada3722fe5b63fd43d9c8990759d0a2cf489c8c5d7b2bdebc021", + "sha256": "066dda7f73d8eb48ba630a55acb50c4a84a2e6b453b1cb4567f581729e794f7b", "url": "https://pub.dev" }, "source": "hosted", - "version": "8.0.0" + "version": "9.3.1" }, "built_collection": { "dependency": "transitive", @@ -194,11 +204,11 @@ "dependency": "transitive", "description": { "name": "built_value", - "sha256": "ea90e81dc4a25a043d9bee692d20ed6d1c4a1662a28c03a96417446c093ed6b4", + "sha256": "a30f0a0e38671e89a492c44d005b5545b830a961575bbd8336d42869ff71066d", "url": "https://pub.dev" }, "source": "hosted", - "version": "8.9.5" + "version": "8.12.0" }, "characters": { "dependency": "transitive", @@ -214,11 +224,11 @@ "dependency": "transitive", "description": { "name": "checked_yaml", - "sha256": "feb6bed21949061731a7a75fc5d2aa727cf160b91af9a3e464c5e3a32e28b5ff", + "sha256": "959525d3162f249993882720d52b7e0c833978df229be20702b33d48d91de70f", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.3" + "version": "2.0.4" }, "ci": { "dependency": "transitive", @@ -230,6 +240,16 @@ "source": "hosted", "version": "0.1.0" }, + "cli_config": { + "dependency": "transitive", + "description": { + "name": "cli_config", + "sha256": "ac20a183a07002b700f0c25e61b7ee46b23c309d76ab7b7640a028f18e4d99ec", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.0" + }, "cli_util": { "dependency": "transitive", "description": { @@ -254,11 +274,11 @@ "dependency": "transitive", "description": { "name": "code_builder", - "sha256": "0ec10bf4a89e4c613960bf1e8b42c64127021740fb21640c29c909826a5eea3e", + "sha256": "11654819532ba94c34de52ff5feb52bd81cba1de00ef2ed622fd50295f9d4243", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.10.1" + "version": "4.11.0" }, "collection": { "dependency": "direct main", @@ -274,11 +294,11 @@ "dependency": "direct main", "description": { "name": "connectivity_plus", - "sha256": "051849e2bd7c7b3bc5844ea0d096609ddc3a859890ec3a9ac4a65a2620cc1f99", + "sha256": "b5e72753cf63becce2c61fd04dfe0f1c430cc5278b53a1342dc5ad839eab29ec", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.1.4" + "version": "6.1.5" }, "connectivity_plus_platform_interface": { "dependency": "transitive", @@ -300,6 +320,16 @@ "source": "hosted", "version": "3.1.2" }, + "coverage": { + "dependency": "transitive", + "description": { + "name": "coverage", + "sha256": "5da775aa218eaf2151c721b16c01c7676fbfdd99cebba2bf64e8b807a28ff94d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.15.0" + }, "cross_file": { "dependency": "transitive", "description": { @@ -321,54 +351,54 @@ "version": "3.0.6" }, "custom_lint": { - "dependency": "direct dev", + "dependency": "transitive", "description": { "name": "custom_lint", - "sha256": "021897cce2b6c783b2521543e362e7fe1a2eaab17bf80514d8de37f99942ed9e", + "sha256": "78085fbe842de7c5bef92de811ca81536968dbcbbcdac5c316711add2d15e796", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.7.3" + "version": "0.8.0" }, "custom_lint_builder": { "dependency": "transitive", "description": { "name": "custom_lint_builder", - "sha256": "e4235b9d8cef59afe621eba086d245205c8a0a6c70cd470be7cb17494d6df32d", + "sha256": "cc5532d5733d4eccfccaaec6070a1926e9f21e613d93ad0927fad020b95c9e52", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.7.3" + "version": "0.8.0" }, "custom_lint_core": { "dependency": "transitive", "description": { "name": "custom_lint_core", - "sha256": "6dcee8a017181941c51a110da7e267c1d104dc74bec8862eeb8c85b5c8759a9e", + "sha256": "cc4684d22ca05bf0a4a51127e19a8aea576b42079ed2bc9e956f11aaebe35dd1", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.7.1" + "version": "0.8.0" }, "custom_lint_visitor": { "dependency": "transitive", "description": { "name": "custom_lint_visitor", - "sha256": "36282d85714af494ee2d7da8c8913630aa6694da99f104fb2ed4afcf8fc857d8", + "sha256": "4a86a0d8415a91fbb8298d6ef03e9034dc8e323a599ddc4120a0e36c433983a2", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.0.0+7.3.0" + "version": "1.0.0+7.7.0" }, "dart_style": { "dependency": "transitive", "description": { "name": "dart_style", - "sha256": "5b236382b47ee411741447c1f1e111459c941ea1b3f2b540dde54c210a3662af", + "sha256": "8a0e5fba27e8ee025d2ffb4ee820b4e6e2cf5e4246a6b1a477eb66866947e0bb", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.1.0" + "version": "3.1.1" }, "dbus": { "dependency": "transitive", @@ -394,31 +424,31 @@ "dependency": "direct main", "description": { "name": "device_info_plus", - "sha256": "0c6396126421b590089447154c5f98a5de423b70cfb15b1578fd018843ee6f53", + "sha256": "98f28b42168cc509abc92f88518882fd58061ea372d7999aecc424345c7bff6a", "url": "https://pub.dev" }, "source": "hosted", - "version": "11.4.0" + "version": "11.5.0" }, "device_info_plus_platform_interface": { "dependency": "transitive", "description": { "name": "device_info_plus_platform_interface", - "sha256": "0b04e02b30791224b31969eb1b50d723498f402971bff3630bca2ba839bd1ed2", + "sha256": "e1ea89119e34903dca74b883d0dd78eb762814f97fb6c76f35e9ff74d261a18f", "url": "https://pub.dev" }, "source": "hosted", - "version": "7.0.2" + "version": "7.0.3" }, "dio": { "dependency": "direct main", "description": { "name": "dio", - "sha256": "253a18bbd4851fecba42f7343a1df3a9a4c1d31a2c1b37e221086b4fa8c8dbc9", + "sha256": "d90ee57923d1828ac14e492ca49440f65477f4bb1263575900be731a3dac66a9", "url": "https://pub.dev" }, "source": "hosted", - "version": "5.8.0+1" + "version": "5.9.0" }, "dio_web_adapter": { "dependency": "transitive", @@ -434,11 +464,11 @@ "dependency": "direct main", "description": { "name": "dynamic_color", - "sha256": "eae98052fa6e2826bdac3dd2e921c6ce2903be15c6b7f8b6d8a5d49b5086298d", + "sha256": "43a5a6679649a7731ab860334a5812f2067c2d9ce6452cf069c5e0c25336c17c", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.7.0" + "version": "1.8.1" }, "emoji_regex": { "dependency": "direct main", @@ -480,16 +510,6 @@ "source": "hosted", "version": "2.1.4" }, - "ffigen": { - "dependency": "direct dev", - "description": { - "name": "ffigen", - "sha256": "72d732c33557fc0ca9b46379d3deff2dadbdc539696dc0b270189e2989be20ef", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "18.1.0" - }, "file": { "dependency": "transitive", "description": { @@ -504,11 +524,11 @@ "dependency": "direct main", "description": { "name": "file_picker", - "sha256": "ab13ae8ef5580a411c458d6207b6774a6c237d77ac37011b13994879f68a8810", + "sha256": "f2d9f173c2c14635cc0e9b14c143c49ef30b4934e8d1d274d6206fcb0086a06f", "url": "https://pub.dev" }, "source": "hosted", - "version": "8.3.7" + "version": "10.3.3" }, "file_selector_linux": { "dependency": "transitive", @@ -524,11 +544,11 @@ "dependency": "transitive", "description": { "name": "file_selector_macos", - "sha256": "271ab9986df0c135d45c3cdb6bd0faa5db6f4976d3e4b437cf7d0f258d941bfc", + "sha256": "19124ff4a3d8864fdc62072b6a2ef6c222d55a3404fe14893a3c02744907b60c", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.9.4+2" + "version": "0.9.4+4" }, "file_selector_platform_interface": { "dependency": "transitive", @@ -566,16 +586,6 @@ "source": "sdk", "version": "0.0.0" }, - "flutter_acrylic": { - "dependency": "direct main", - "description": { - "name": "flutter_acrylic", - "sha256": "b3996dbde5abf5823cc9ead4cf2e5267c3181f15585fe47ce4dc4472e7ec827a", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.1.4" - }, "flutter_cache_manager": { "dependency": "direct main", "description": { @@ -617,31 +627,31 @@ "dependency": "transitive", "description": { "name": "flutter_plugin_android_lifecycle", - "sha256": "f948e346c12f8d5480d2825e03de228d0eb8c3a737e4cdaa122267b89c022b5e", + "sha256": "b0694b7fb1689b0e6cc193b3f1fcac6423c4f93c74fb20b806c6b6f196db0c31", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.28" + "version": "2.0.30" }, "flutter_riverpod": { "dependency": "direct main", "description": { "name": "flutter_riverpod", - "sha256": "9532ee6db4a943a1ed8383072a2e3eeda041db5657cdf6d2acecf3c21ecbe7e1", + "sha256": "ca2480512a8e840291325249f4857e363ffa5d1b77b132e189c9313a9d9fb9e0", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.6.1" + "version": "3.0.0" }, "flutter_svg": { "dependency": "direct main", "description": { "name": "flutter_svg", - "sha256": "d44bf546b13025ec7353091516f6881f1d4c633993cb109c3916c3a0159dadf1", + "sha256": "b9c2ad5872518a27507ab432d1fb97e8813b05f0fc693f9d40fad06d073e0678", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.0" + "version": "2.2.1" }, "flutter_test": { "dependency": "direct dev", @@ -659,21 +669,21 @@ "dependency": "direct dev", "description": { "name": "freezed", - "sha256": "59a584c24b3acdc5250bb856d0d3e9c0b798ed14a4af1ddb7dc1c7b41df91c9c", + "sha256": "13065f10e135263a4f5a4391b79a8efc5fb8106f8dd555a9e49b750b45393d77", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.5.8" + "version": "3.2.3" }, "freezed_annotation": { "dependency": "direct main", "description": { "name": "freezed_annotation", - "sha256": "c2e2d632dd9b8a2b7751117abcfc2b4888ecfe181bd9fca7170d9ef02e595fe2", + "sha256": "7294967ff0a6d98638e7acb774aac3af2550777accd8149c90af5b014e6d44d8", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.4" + "version": "3.1.0" }, "frontend_server_client": { "dependency": "transitive", @@ -779,11 +789,11 @@ "dependency": "transitive", "description": { "name": "http", - "sha256": "2c11f3f94c687ee9bad77c171151672986360b2b001d109814ee7140b2cf261b", + "sha256": "bb2ce4590bc2667c96f318d68cac1b5a7987ec819351d32b1c987239a815e007", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.4.0" + "version": "1.5.0" }, "http_multi_server": { "dependency": "transitive", @@ -809,81 +819,81 @@ "dependency": "direct main", "description": { "name": "image_picker", - "sha256": "021834d9c0c3de46bf0fe40341fa07168407f694d9b2bb18d532dc1261867f7a", + "sha256": "736eb56a911cf24d1859315ad09ddec0b66104bc41a7f8c5b96b4e2620cf5041", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.2" + "version": "1.2.0" }, "image_picker_android": { "dependency": "transitive", "description": { "name": "image_picker_android", - "sha256": "317a5d961cec5b34e777b9252393f2afbd23084aa6e60fcf601dcf6341b9ebeb", + "sha256": "8dfe08ea7fcf7467dbaf6889e72eebd5e0d6711caae201fdac780eb45232cd02", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.8.12+23" + "version": "0.8.13+3" }, "image_picker_for_web": { "dependency": "transitive", "description": { "name": "image_picker_for_web", - "sha256": "717eb042ab08c40767684327be06a5d8dbb341fe791d514e4b92c7bbe1b7bb83", + "sha256": "40c2a6a0da15556dc0f8e38a3246064a971a9f512386c3339b89f76db87269b6", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.0.6" + "version": "3.1.0" }, "image_picker_ios": { "dependency": "transitive", "description": { "name": "image_picker_ios", - "sha256": "05da758e67bc7839e886b3959848aa6b44ff123ab4b28f67891008afe8ef9100", + "sha256": "eb06fe30bab4c4497bad449b66448f50edcc695f1c59408e78aa3a8059eb8f0e", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.8.12+2" + "version": "0.8.13" }, "image_picker_linux": { "dependency": "transitive", "description": { "name": "image_picker_linux", - "sha256": "34a65f6740df08bbbeb0a1abd8e6d32107941fd4868f67a507b25601651022c9", + "sha256": "1f81c5f2046b9ab724f85523e4af65be1d47b038160a8c8deed909762c308ed4", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.2.1+2" + "version": "0.2.2" }, "image_picker_macos": { "dependency": "transitive", "description": { "name": "image_picker_macos", - "sha256": "1b90ebbd9dcf98fb6c1d01427e49a55bd96b5d67b8c67cf955d60a5de74207c1", + "sha256": "d58cd9d67793d52beefd6585b12050af0a7663c0c2a6ece0fb110a35d6955e04", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.2.1+2" + "version": "0.2.2" }, "image_picker_platform_interface": { "dependency": "transitive", "description": { "name": "image_picker_platform_interface", - "sha256": "886d57f0be73c4b140004e78b9f28a8914a09e50c2d816bdd0520051a71236a0", + "sha256": "9f143b0dba3e459553209e20cc425c9801af48e6dfa4f01a0fcf927be3f41665", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.10.1" + "version": "2.11.0" }, "image_picker_windows": { "dependency": "transitive", "description": { "name": "image_picker_windows", - "sha256": "6ad07afc4eb1bc25f3a01084d28520496c4a3bb0cb13685435838167c9dcedeb", + "sha256": "d248c86554a72b5495a31c56f060cf73a41c7ff541689327b1a7dbccc33adfae", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.2.1+1" + "version": "0.2.2" }, "intl": { "dependency": "direct main", @@ -949,11 +959,11 @@ "dependency": "direct dev", "description": { "name": "json_serializable", - "sha256": "c50ef5fc083d5b5e12eef489503ba3bf5ccc899e487d691584699b4bdefeea8c", + "sha256": "33a040668b31b320aafa4822b7b1e177e163fc3c1e835c6750319d4ab23aa6fe", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.9.5" + "version": "6.11.1" }, "launch_at_startup": { "dependency": "direct main", @@ -969,31 +979,31 @@ "dependency": "transitive", "description": { "name": "leak_tracker", - "sha256": "6bb818ecbdffe216e81182c2f0714a2e62b593f4a4f13098713ff1685dfb6ab0", + "sha256": "33e2e26bdd85a0112ec15400c8cbffea70d0f9c3407491f672a2fad47915e2de", "url": "https://pub.dev" }, "source": "hosted", - "version": "10.0.9" + "version": "11.0.2" }, "leak_tracker_flutter_testing": { "dependency": "transitive", "description": { "name": "leak_tracker_flutter_testing", - "sha256": "f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573", + "sha256": "1dbc140bb5a23c75ea9c4811222756104fbcd1a27173f0c34ca01e16bea473c1", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.0.9" + "version": "3.0.10" }, "leak_tracker_testing": { "dependency": "transitive", "description": { "name": "leak_tracker_testing", - "sha256": "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3", + "sha256": "8d5a2d49f4a66b49744b23b018848400d23e54caf9463f4eb20df3eb8acb2eb1", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.0.1" + "version": "3.0.2" }, "lints": { "dependency": "transitive", @@ -1015,26 +1025,6 @@ "source": "hosted", "version": "1.3.0" }, - "lpinyin": { - "dependency": "direct main", - "description": { - "name": "lpinyin", - "sha256": "0bb843363f1f65170efd09fbdfc760c7ec34fc6354f9fcb2f89e74866a0d814a", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.0.3" - }, - "macos_window_utils": { - "dependency": "transitive", - "description": { - "name": "macos_window_utils", - "sha256": "4e683da162825018580c7341d9e926a6fa39a869a3504c2e5471618553bd55cd", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.8.2" - }, "matcher": { "dependency": "transitive", "description": { @@ -1089,11 +1079,21 @@ "dependency": "direct main", "description": { "name": "mobile_scanner", - "sha256": "72f06a071aa8b14acea3ab43ea7949eefe4a2469731ae210e006ba330a033a8c", + "sha256": "54005bdea7052d792d35b4fef0f84ec5ddc3a844b250ecd48dc192fb9b4ebc95", "url": "https://pub.dev" }, "source": "hosted", - "version": "7.0.0" + "version": "7.0.1" + }, + "mockito": { + "dependency": "transitive", + "description": { + "name": "mockito", + "sha256": "2314cbe9165bcd16106513df9cf3c3224713087f09723b128928dc11a4379f99", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.5.0" }, "nm": { "dependency": "transitive", @@ -1105,6 +1105,16 @@ "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" + }, "package_config": { "dependency": "transitive", "description": { @@ -1119,21 +1129,21 @@ "dependency": "direct main", "description": { "name": "package_info_plus", - "sha256": "7976bfe4c583170d6cdc7077e3237560b364149fcd268b5f53d95a991963b191", + "sha256": "16eee997588c60225bda0488b6dcfac69280a6b7a3cf02c741895dd370a02968", "url": "https://pub.dev" }, "source": "hosted", - "version": "8.3.0" + "version": "8.3.1" }, "package_info_plus_platform_interface": { "dependency": "transitive", "description": { "name": "package_info_plus_platform_interface", - "sha256": "6c935fb612dff8e3cc9632c2b301720c77450a126114126ffaafe28d2e87956c", + "sha256": "202a487f08836a592a6bd4f901ac69b3a8f146af552bbd14407b6b41e1c3f086", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.2.0" + "version": "3.2.1" }, "path": { "dependency": "direct main", @@ -1169,21 +1179,21 @@ "dependency": "transitive", "description": { "name": "path_provider_android", - "sha256": "d0d310befe2c8ab9e7f393288ccbb11b60c019c6b5afc21973eeee4dda2b35e9", + "sha256": "993381400e94d18469750e5b9dcb8206f15bc09f9da86b9e44a9b0092a0066db", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.2.17" + "version": "2.2.18" }, "path_provider_foundation": { "dependency": "transitive", "description": { "name": "path_provider_foundation", - "sha256": "4843174df4d288f5e29185bd6e72a6fbdf5a4a4602717eed565497429f179942", + "sha256": "16eef174aacb07e09c351502740fa6254c165757638eba1e9116b0a781201bbd", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.1" + "version": "2.4.2" }, "path_provider_linux": { "dependency": "transitive", @@ -1219,11 +1229,11 @@ "dependency": "transitive", "description": { "name": "petitparser", - "sha256": "07c8f0b1913bcde1ff0d26e57ace2f3012ccbf2b204e070290dad3bb22797646", + "sha256": "1a97266a94f7350d30ae522c0af07890c70b8e62c71e8e3920d1db4d23c057d1", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.1.0" + "version": "7.0.1" }, "platform": { "dependency": "transitive", @@ -1249,11 +1259,21 @@ "dependency": "transitive", "description": { "name": "pool", - "sha256": "20fe868b6314b322ea036ba325e6fc0711a22948856475e2c2b6306e8ab39c2a", + "sha256": "978783255c543aa3586a1b3c21f6e9d720eb315376a915872c61ef8b5c20177d", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.5.1" + "version": "1.5.2" + }, + "posix": { + "dependency": "transitive", + "description": { + "name": "posix", + "sha256": "6323a5b0fa688b6a010df4905a56b00181479e6d10534cecfecede2aa55add61", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.0.3" }, "proxy": { "dependency": "direct main", @@ -1284,16 +1304,6 @@ "source": "hosted", "version": "1.5.0" }, - "quiver": { - "dependency": "transitive", - "description": { - "name": "quiver", - "sha256": "ea0b925899e64ecdfbf9c7becb60d5b50e706ade44a85b2363be2a22d88117d2", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.2.2" - }, "re_editor": { "dependency": "direct main", "description": { @@ -1319,51 +1329,51 @@ "dependency": "direct main", "description": { "name": "riverpod", - "sha256": "59062512288d3056b2321804332a13ffdd1bf16df70dcc8e506e411280a72959", + "sha256": "135723ec44dfba141bc4696224048a408336e794228a0117439e7ad0a8be6d05", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.6.1" + "version": "3.0.0" }, "riverpod_analyzer_utils": { "dependency": "transitive", "description": { "name": "riverpod_analyzer_utils", - "sha256": "837a6dc33f490706c7f4632c516bcd10804ee4d9ccc8046124ca56388715fdf3", + "sha256": "c971e50f678d55c87d9e3b5015df7fcaadb2302a84ea101247cf99387b4554fe", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.5.9" + "version": "1.0.0-dev.6" }, "riverpod_annotation": { "dependency": "direct main", "description": { "name": "riverpod_annotation", - "sha256": "e14b0bf45b71326654e2705d462f21b958f987087be850afd60578fcd502d1b8", + "sha256": "1f9c1bc10b13f68ebc83ab391e77a865ff796880461d2a60c5ce301e1fb65f51", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.6.1" + "version": "3.0.0" }, "riverpod_generator": { "dependency": "direct dev", "description": { "name": "riverpod_generator", - "sha256": "120d3310f687f43e7011bb213b90a436f1bbc300f0e4b251a72c39bccb017a4f", + "sha256": "178d6bfa6de66d7db97db2466e5fad2da91a678ab376a7309235eec731755046", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.6.4" + "version": "3.0.0" }, "riverpod_lint": { "dependency": "direct dev", "description": { "name": "riverpod_lint", - "sha256": "b05408412b0f75dec954e032c855bc28349eeed2d2187f94519e1ddfdf8b3693", + "sha256": "89bce8d40bed52aa89b43ef45cfe473a9c7736629d61fc659c95e4e9f4d571a6", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.6.4" + "version": "3.0.0" }, "rxdart": { "dependency": "transitive", @@ -1439,11 +1449,11 @@ "dependency": "transitive", "description": { "name": "shared_preferences_android", - "sha256": "20cbd561f743a342c76c151d6ddb93a9ce6005751e7aa458baad3858bfbfb6ac", + "sha256": "a2608114b1ffdcbc9c120eb71a0e207c71da56202852d4aab8a5e30a82269e74", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.10" + "version": "2.4.12" }, "shared_preferences_foundation": { "dependency": "transitive", @@ -1505,6 +1515,26 @@ "source": "hosted", "version": "1.4.2" }, + "shelf_packages_handler": { + "dependency": "transitive", + "description": { + "name": "shelf_packages_handler", + "sha256": "89f967eca29607c933ba9571d838be31d67f53f6e4ee15147d5dc2934fee1b1e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.2" + }, + "shelf_static": { + "dependency": "transitive", + "description": { + "name": "shelf_static", + "sha256": "c87c3875f91262785dade62d135760c2c69cb217ac759485334c5857ad89f6e3", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.3" + }, "shelf_web_socket": { "dependency": "transitive", "description": { @@ -1535,21 +1565,41 @@ "dependency": "transitive", "description": { "name": "source_gen", - "sha256": "35c8150ece9e8c8d263337a265153c3329667640850b9304861faea59fc98f6b", + "sha256": "7b19d6ba131c6eb98bfcbf8d56c1a7002eba438af2e7ae6f8398b2b0f4f381e3", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.0" + "version": "3.1.0" }, "source_helper": { "dependency": "transitive", "description": { "name": "source_helper", - "sha256": "86d247119aedce8e63f4751bd9626fc9613255935558447569ad42f9f5b48b3c", + "sha256": "6a3c6cc82073a8797f8c4dc4572146114a39652851c157db37e964d9c7038723", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.3.5" + "version": "1.3.8" + }, + "source_map_stack_trace": { + "dependency": "transitive", + "description": { + "name": "source_map_stack_trace", + "sha256": "c0713a43e323c3302c2abe2a1cc89aa057a387101ebd280371d6a6c9fa68516b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.2" + }, + "source_maps": { + "dependency": "transitive", + "description": { + "name": "source_maps", + "sha256": "190222579a448b03896e0ca6eca5998fa810fda630c1d65e2f78b3f638f54812", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.10.13" }, "source_span": { "dependency": "transitive", @@ -1585,21 +1635,21 @@ "dependency": "transitive", "description": { "name": "sqflite_android", - "sha256": "2b3070c5fa881839f8b402ee4a39c1b4d561704d4ebbbcfb808a119bc2a1701b", + "sha256": "ecd684501ebc2ae9a83536e8b15731642b9570dc8623e0073d227d0ee2bfea88", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.1" + "version": "2.4.2+2" }, "sqflite_common": { "dependency": "transitive", "description": { "name": "sqflite_common", - "sha256": "84731e8bfd8303a3389903e01fb2141b6e59b5973cacbb0929021df08dddbe8b", + "sha256": "6ef422a4525ecc601db6c0a2233ff448c731307906e92cabc9ba292afaae16a6", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.5.5" + "version": "2.5.6" }, "sqflite_darwin": { "dependency": "transitive", @@ -1685,11 +1735,11 @@ "dependency": "transitive", "description": { "name": "synchronized", - "sha256": "0669c70faae6270521ee4f05bffd2919892d42d1276e6c495be80174b6bc0ef6", + "sha256": "c254ade258ec8282947a0acbbc90b9575b4f19673533ee46f2f6e9b3aeefd7c0", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.3.1" + "version": "3.4.0" }, "term_glyph": { "dependency": "transitive", @@ -1701,15 +1751,35 @@ "source": "hosted", "version": "1.2.2" }, + "test": { + "dependency": "transitive", + "description": { + "name": "test", + "sha256": "65e29d831719be0591f7b3b1a32a3cda258ec98c58c7b25f7b84241bc31215bb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.26.2" + }, "test_api": { "dependency": "transitive", "description": { "name": "test_api", - "sha256": "fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd", + "sha256": "522f00f556e73044315fa4585ec3270f1808a4b186c936e612cab0b565ff1e00", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.7.4" + "version": "0.7.6" + }, + "test_core": { + "dependency": "transitive", + "description": { + "name": "test_core", + "sha256": "80bf5a02b60af04b09e14f6fe68b921aad119493e26e490deaca5993fef1b05a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.6.11" }, "timing": { "dependency": "transitive", @@ -1725,11 +1795,11 @@ "dependency": "direct main", "description": { "name": "tray_manager", - "sha256": "ad18c4cd73003097d182884bacb0578ad2865f3ab842a0ad00f6d043ed49eaf0", + "sha256": "537e539f48cd82d8ee2240d4330158c7b44c7e043e8e18b5811f2f8f6b7df25a", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.5.0" + "version": "0.5.1" }, "typed_data": { "dependency": "transitive", @@ -1755,31 +1825,31 @@ "dependency": "direct main", "description": { "name": "url_launcher", - "sha256": "9d06212b1362abc2f0f0d78e6f09f726608c74e3b9462e8368bb03314aa8d603", + "sha256": "f6a7e5c4835bb4e3026a04793a4199ca2d14c739ec378fdfe23fc8075d0439f8", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.3.1" + "version": "6.3.2" }, "url_launcher_android": { "dependency": "transitive", "description": { "name": "url_launcher_android", - "sha256": "8582d7f6fe14d2652b4c45c9b6c14c0b678c2af2d083a11b604caeba51930d79", + "sha256": "199bc33e746088546a39cc5f36bac5a278c5e53b40cb3196f99e7345fdcfae6b", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.3.16" + "version": "6.3.22" }, "url_launcher_ios": { "dependency": "transitive", "description": { "name": "url_launcher_ios", - "sha256": "7f2022359d4c099eea7df3fdf739f7d3d3b9faf3166fb1dd390775176e0b76cb", + "sha256": "d80b3f567a617cb923546034cc94bfe44eb15f989fe670b37f26abdb9d939cb7", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.3.3" + "version": "6.3.4" }, "url_launcher_linux": { "dependency": "transitive", @@ -1795,11 +1865,11 @@ "dependency": "transitive", "description": { "name": "url_launcher_macos", - "sha256": "17ba2000b847f334f16626a574c702b196723af2a289e7a93ffcb79acff855c2", + "sha256": "c043a77d6600ac9c38300567f33ef12b0ef4f4783a2c1f00231d2b1941fea13f", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.2.2" + "version": "3.2.3" }, "url_launcher_platform_interface": { "dependency": "transitive", @@ -1845,11 +1915,11 @@ "dependency": "transitive", "description": { "name": "vector_graphics", - "sha256": "44cc7104ff32563122a929e4620cf3efd584194eec6d1d913eb5ba593dbcf6de", + "sha256": "a4f059dc26fc8295b5921376600a194c4ec7d55e72f2fe4c7d2831e103d461e6", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.18" + "version": "1.1.19" }, "vector_graphics_codec": { "dependency": "transitive", @@ -1865,41 +1935,41 @@ "dependency": "transitive", "description": { "name": "vector_graphics_compiler", - "sha256": "557a315b7d2a6dbb0aaaff84d857967ce6bdc96a63dc6ee2a57ce5a6ee5d3331", + "sha256": "d354a7ec6931e6047785f4db12a1f61ec3d43b207fc0790f863818543f8ff0dc", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.17" + "version": "1.1.19" }, "vector_math": { "dependency": "transitive", "description": { "name": "vector_math", - "sha256": "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803", + "sha256": "d530bd74fea330e6e364cda7a85019c434070188383e1cd8d9777ee586914c5b", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.4" + "version": "2.2.0" }, "vm_service": { "dependency": "transitive", "description": { "name": "vm_service", - "sha256": "ddfa8d30d89985b96407efce8acbdd124701f96741f2d981ca860662f1c0dc02", + "sha256": "45caa6c5917fa127b5dbcfbd1fa60b14e583afdc08bfc96dda38886ca252eb60", "url": "https://pub.dev" }, "source": "hosted", - "version": "15.0.0" + "version": "15.0.2" }, "watcher": { "dependency": "transitive", "description": { "name": "watcher", - "sha256": "69da27e49efa56a15f8afe8f4438c4ec02eff0a117df1b22ea4aad194fe1c104", + "sha256": "5bf046f41320ac97a469d506261797f35254fa61c641741ef32dacda98b7d39c", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.1" + "version": "1.1.3" }, "web": { "dependency": "transitive", @@ -1941,15 +2011,25 @@ "source": "hosted", "version": "1.2.2" }, + "webkit_inspection_protocol": { + "dependency": "transitive", + "description": { + "name": "webkit_inspection_protocol", + "sha256": "87d3f2333bb240704cd3f1c6b5b7acd8a10e7f0bc28c28dcf14e782014f4a572", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.1" + }, "win32": { "dependency": "direct main", "description": { "name": "win32", - "sha256": "329edf97fdd893e0f1e3b9e88d6a0e627128cc17cc316a8d67fda8f1451178ba", + "sha256": "66814138c3562338d05613a6e368ed8cfb237ad6d64a9e9334be3f309acfca03", "url": "https://pub.dev" }, "source": "hosted", - "version": "5.13.0" + "version": "5.14.0" }, "win32_registry": { "dependency": "direct main", @@ -1974,11 +2054,11 @@ "dependency": "direct main", "description": { "name": "window_manager", - "sha256": "51d50168ab267d344b975b15390426b1243600d436770d3f13de67e55b05ec16", + "sha256": "7eb6d6c4164ec08e1bf978d6e733f3cebe792e2a23fb07cbca25c2872bfdbdcd", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.5.0" + "version": "0.5.1" }, "xdg_directories": { "dependency": "transitive", @@ -1994,11 +2074,11 @@ "dependency": "transitive", "description": { "name": "xml", - "sha256": "b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226", + "sha256": "971043b3a0d3da28727e40ed3e0b5d18b742fa5a68665cca88e74b7876d5e025", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.5.0" + "version": "6.6.1" }, "yaml": { "dependency": "transitive", @@ -2009,20 +2089,10 @@ }, "source": "hosted", "version": "3.1.3" - }, - "yaml_edit": { - "dependency": "transitive", - "description": { - "name": "yaml_edit", - "sha256": "fb38626579fb345ad00e674e2af3a5c9b0cc4b9bfb8fd7f7ff322c7c9e62aef5", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.2.2" } }, "sdks": { - "dart": ">=3.8.0 <4.0.0", - "flutter": ">=3.29.0" + "dart": ">=3.9.0 <4.0.0", + "flutter": ">=3.35.0" } } diff --git a/pkgs/by-name/fl/flclash/update.sh b/pkgs/by-name/fl/flclash/update.sh index b2fea37f8187..37627d5043b6 100755 --- a/pkgs/by-name/fl/flclash/update.sh +++ b/pkgs/by-name/fl/flclash/update.sh @@ -1,20 +1,20 @@ #!/usr/bin/env nix-shell -#!nix-shell -I nixpkgs=./. -i bash -p curl gnused jq yq nix bash coreutils nix-update +#!nix-shell -i bash -p curl gnused jq yq-go nix bash nix-update set -eou pipefail -ROOT="$(dirname "$(readlink -f "$0")")" +PACKAGE_DIR=$(realpath "$(dirname "$0")") -latestTag=$(curl ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} -sL https://api.github.com/repos/chen08209/FlClash/releases/latest | jq --raw-output .tag_name) +latestTag=$(curl --fail --location --silent ${GITHUB_TOKEN:+--user ":$GITHUB_TOKEN"} https://api.github.com/repos/chen08209/FlClash/releases/latest | jq --raw-output .tag_name) latestVersion=$(echo "$latestTag" | sed 's/^v//') -currentVersion=$(nix-instantiate --eval -E "with import ./. {}; flclash.version or (lib.getVersion flclash)" | tr -d '"') +currentVersion=$(nix eval --file . --raw flclash.version) if [[ "$currentVersion" == "$latestVersion" ]]; then echo "package is up-to-date: $currentVersion" exit 0 fi -nix-update --subpackage libclash flclash +nix-update --subpackage core --use-github-releases flclash -curl https://raw.githubusercontent.com/chen08209/FlClash/${latestTag}/pubspec.lock | yq . >$ROOT/pubspec.lock.json +curl --fail --location --silent https://raw.githubusercontent.com/chen08209/FlClash/${latestTag}/pubspec.lock | yq eval --output-format=json --prettyPrint >$PACKAGE_DIR/pubspec.lock.json diff --git a/pkgs/development/compilers/dart/package-source-builders/default.nix b/pkgs/development/compilers/dart/package-source-builders/default.nix index c19832506b78..16e70b9ec0ba 100644 --- a/pkgs/development/compilers/dart/package-source-builders/default.nix +++ b/pkgs/development/compilers/dart/package-source-builders/default.nix @@ -7,6 +7,7 @@ flutter_vodozemac = callPackage ./flutter_vodozemac { }; flutter_volume_controller = callPackage ./flutter_volume_controller { }; handy_window = callPackage ./handy-window { }; + hotkey_manager_linux = callPackage ./hotkey_manager_linux { }; matrix = callPackage ./matrix { }; media_kit_libs_linux = callPackage ./media_kit_libs_linux { }; olm = callPackage ./olm { }; diff --git a/pkgs/development/compilers/dart/package-source-builders/hotkey_manager_linux/default.nix b/pkgs/development/compilers/dart/package-source-builders/hotkey_manager_linux/default.nix new file mode 100644 index 000000000000..51b2d8d69847 --- /dev/null +++ b/pkgs/development/compilers/dart/package-source-builders/hotkey_manager_linux/default.nix @@ -0,0 +1,27 @@ +{ + stdenv, +}: + +{ version, src, ... }: + +stdenv.mkDerivation { + pname = "hotkey_manager_linux"; + inherit version src; + inherit (src) passthru; + + postPatch = '' + pushd ${src.passthru.packageRoot} + substituteInPlace linux/hotkey_manager_linux_plugin.cc \ + --replace-fail "const char* identifier;" "const char* identifier = nullptr;" \ + --replace-fail "const char* keystring;" "const char* keystring = nullptr;" + popd + ''; + + installPhase = '' + runHook preInstall + + cp --recursive . "$out" + + runHook postInstall + ''; +}