From c6317736e08a7fe52c0e5a5ebfcb21a4c3cbbf3e Mon Sep 17 00:00:00 2001 From: emaryn Date: Sat, 8 Feb 2025 08:43:58 +0800 Subject: [PATCH] oneanime: 1.3.7 -> 1.3.8 --- pkgs/by-name/on/oneanime/package.nix | 58 +++++++++++++++------- pkgs/by-name/on/oneanime/pubspec.lock.json | 38 +++++++------- 2 files changed, 60 insertions(+), 36 deletions(-) diff --git a/pkgs/by-name/on/oneanime/package.nix b/pkgs/by-name/on/oneanime/package.nix index 46e6ead2cdee..583d635db7b5 100644 --- a/pkgs/by-name/on/oneanime/package.nix +++ b/pkgs/by-name/on/oneanime/package.nix @@ -4,7 +4,6 @@ flutter327, autoPatchelfHook, makeDesktopItem, - pkg-config, copyDesktopItems, alsa-lib, libepoxy, @@ -16,7 +15,13 @@ mpv-unwrapped, mpv, mimalloc, + runCommand, + yq, + oneanime, + _experimental-update-script-combinators, + gitUpdater, }: + let libopencc = buildGoModule rec { pname = "libopencc"; @@ -50,34 +55,37 @@ let meta = { homepage = "https://github.com/Predidit/open_chinese_convert_bridge"; license = with lib.licenses; [ gpl3Plus ]; - maintainers = with lib.maintainers; [ ]; }; }; in flutter327.buildFlutterApplication rec { pname = "oneanime"; - version = "1.3.7"; + version = "1.3.8"; src = fetchFromGitHub { owner = "Predidit"; repo = "oneAnime"; tag = version; - hash = "sha256-lRO5JYzzopy69lJ0/4pLf4u93NlYLaghhG4Fuf04f6A="; + hash = "sha256-YPz0sctDzzBM1B/Ugspwj2Jg8LMSuB84ngZ8+PnlrDM="; }; pubspecLock = lib.importJSON ./pubspec.lock.json; - gitHashes = { - flutter_open_chinese_convert = "sha256-uRPBBB5RUd8fiFaM8dg9Th2tvQYwnbsQrsiDSPMm5kk="; - media_kit = "sha256-bWS3j4mUdMYfPhzS16z3NZxLTQDrEpDm3dtkzxcdKpQ="; - media_kit_libs_android_video = "sha256-bWS3j4mUdMYfPhzS16z3NZxLTQDrEpDm3dtkzxcdKpQ="; - media_kit_libs_ios_video = "sha256-bWS3j4mUdMYfPhzS16z3NZxLTQDrEpDm3dtkzxcdKpQ="; - media_kit_libs_linux = "sha256-bWS3j4mUdMYfPhzS16z3NZxLTQDrEpDm3dtkzxcdKpQ="; - media_kit_libs_macos_video = "sha256-bWS3j4mUdMYfPhzS16z3NZxLTQDrEpDm3dtkzxcdKpQ="; - media_kit_libs_video = "sha256-bWS3j4mUdMYfPhzS16z3NZxLTQDrEpDm3dtkzxcdKpQ="; - media_kit_libs_windows_video = "sha256-bWS3j4mUdMYfPhzS16z3NZxLTQDrEpDm3dtkzxcdKpQ="; - media_kit_video = "sha256-bWS3j4mUdMYfPhzS16z3NZxLTQDrEpDm3dtkzxcdKpQ="; - }; + gitHashes = + let + media_kit-hash = "sha256-6V4ZTRsExm8TidznnvAZRXGbkxTLDs7YFNutNh7tLK8="; + in + { + flutter_open_chinese_convert = "sha256-uRPBBB5RUd8fiFaM8dg9Th2tvQYwnbsQrsiDSPMm5kk="; + media_kit = media_kit-hash; + media_kit_libs_android_video = media_kit-hash; + media_kit_libs_ios_video = media_kit-hash; + media_kit_libs_linux = media_kit-hash; + media_kit_libs_macos_video = media_kit-hash; + media_kit_libs_video = media_kit-hash; + media_kit_libs_windows_video = media_kit-hash; + media_kit_video = media_kit-hash; + }; customSourceBuilders = { # unofficial media_kit_libs_linux @@ -136,7 +144,6 @@ flutter327.buildFlutterApplication rec { ]; nativeBuildInputs = [ - pkg-config autoPatchelfHook copyDesktopItems ]; @@ -156,9 +163,26 @@ flutter327.buildFlutterApplication rec { ''; postInstall = '' - install -Dm0644 ./assets/images/logo/logo_android_2.png $out/share/pixmaps/oneanime.png + ln -snf ${mpv}/lib/libmpv.so.2 $out/app/oneanime/lib/libmpv.so.2 + install -Dm0644 assets/images/logo/logo_android_2.png $out/share/pixmaps/oneanime.png ''; + passthru = { + pubspecSource = + runCommand "pubspec.lock.json" + { + nativeBuildInputs = [ yq ]; + inherit (oneanime) src; + } + '' + cat $src/pubspec.lock | yq > $out + ''; + updateScript = _experimental-update-script-combinators.sequence [ + (gitUpdater { }) + (_experimental-update-script-combinators.copyAttrOutputToFile "oneanime.pubspecSource" ./pubspec.lock.json) + ]; + }; + meta = { description = "Anime1 third-party client with bullet screen"; homepage = "https://github.com/Predidit/oneAnime"; diff --git a/pkgs/by-name/on/oneanime/pubspec.lock.json b/pkgs/by-name/on/oneanime/pubspec.lock.json index 6aecb0e4772a..0d9170d17a89 100644 --- a/pkgs/by-name/on/oneanime/pubspec.lock.json +++ b/pkgs/by-name/on/oneanime/pubspec.lock.json @@ -180,11 +180,11 @@ "dependency": "direct main", "description": { "name": "canvas_danmaku", - "sha256": "25bb2dd9a3f46cc47a926a7a3aacca461ae8c6290e9d44767cddc0f9ac4f9c91", + "sha256": "a6761973c72328c3872fa288d0a943bf3675238a30913cf9cd0155d9b7cea9ca", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.2.5" + "version": "0.2.6" }, "characters": { "dependency": "transitive", @@ -635,11 +635,11 @@ "dependency": "transitive", "description": { "name": "http", - "sha256": "b9c29a161230ee03d3ccf545097fccd9b87a5264228c5d348202e0f0c28f9010", + "sha256": "fe7ab022b76f3034adc518fb6ea04a82387620e19977665ea18d30a1cf43442f", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.2.2" + "version": "1.3.0" }, "http_multi_server": { "dependency": "transitive", @@ -806,7 +806,7 @@ "description": { "path": "media_kit", "ref": "main", - "resolved-ref": "eefa578ea41f594b8392653edff6fe8da05cc95b", + "resolved-ref": "a83334c55010a526c592ee16e6ce581b4ca65f1d", "url": "https://github.com/Predidit/media-kit.git" }, "source": "git", @@ -817,7 +817,7 @@ "description": { "path": "libs/android/media_kit_libs_android_video", "ref": "main", - "resolved-ref": "eefa578ea41f594b8392653edff6fe8da05cc95b", + "resolved-ref": "a83334c55010a526c592ee16e6ce581b4ca65f1d", "url": "https://github.com/Predidit/media-kit.git" }, "source": "git", @@ -828,7 +828,7 @@ "description": { "path": "libs/ios/media_kit_libs_ios_video", "ref": "main", - "resolved-ref": "eefa578ea41f594b8392653edff6fe8da05cc95b", + "resolved-ref": "a83334c55010a526c592ee16e6ce581b4ca65f1d", "url": "https://github.com/Predidit/media-kit.git" }, "source": "git", @@ -839,7 +839,7 @@ "description": { "path": "libs/linux/media_kit_libs_linux", "ref": "main", - "resolved-ref": "eefa578ea41f594b8392653edff6fe8da05cc95b", + "resolved-ref": "a83334c55010a526c592ee16e6ce581b4ca65f1d", "url": "https://github.com/Predidit/media-kit.git" }, "source": "git", @@ -850,7 +850,7 @@ "description": { "path": "libs/macos/media_kit_libs_macos_video", "ref": "main", - "resolved-ref": "eefa578ea41f594b8392653edff6fe8da05cc95b", + "resolved-ref": "a83334c55010a526c592ee16e6ce581b4ca65f1d", "url": "https://github.com/Predidit/media-kit.git" }, "source": "git", @@ -861,7 +861,7 @@ "description": { "path": "libs/universal/media_kit_libs_video", "ref": "main", - "resolved-ref": "eefa578ea41f594b8392653edff6fe8da05cc95b", + "resolved-ref": "a83334c55010a526c592ee16e6ce581b4ca65f1d", "url": "https://github.com/Predidit/media-kit.git" }, "source": "git", @@ -872,7 +872,7 @@ "description": { "path": "libs/windows/media_kit_libs_windows_video", "ref": "main", - "resolved-ref": "eefa578ea41f594b8392653edff6fe8da05cc95b", + "resolved-ref": "a83334c55010a526c592ee16e6ce581b4ca65f1d", "url": "https://github.com/Predidit/media-kit.git" }, "source": "git", @@ -883,7 +883,7 @@ "description": { "path": "media_kit_video", "ref": "main", - "resolved-ref": "eefa578ea41f594b8392653edff6fe8da05cc95b", + "resolved-ref": "a83334c55010a526c592ee16e6ce581b4ca65f1d", "url": "https://github.com/Predidit/media-kit.git" }, "source": "git", @@ -973,11 +973,11 @@ "dependency": "transitive", "description": { "name": "package_info_plus", - "sha256": "70c421fe9d9cc1a9a7f3b05ae56befd469fe4f8daa3b484823141a55442d858d", + "sha256": "739e0a5c3c4055152520fa321d0645ee98e932718b4c8efeeb51451968fe0790", "url": "https://pub.dev" }, "source": "hosted", - "version": "8.1.2" + "version": "8.1.3" }, "package_info_plus_platform_interface": { "dependency": "transitive", @@ -1699,21 +1699,21 @@ "dependency": "transitive", "description": { "name": "wakelock_plus", - "sha256": "bf4ee6f17a2fa373ed3753ad0e602b7603f8c75af006d5b9bdade263928c0484", + "sha256": "36c88af0b930121941345306d259ec4cc4ecca3b151c02e3a9e71aede83c615e", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.2.8" + "version": "1.2.10" }, "wakelock_plus_platform_interface": { "dependency": "transitive", "description": { "name": "wakelock_plus_platform_interface", - "sha256": "422d1cdbb448079a8a62a5a770b69baa489f8f7ca21aef47800c726d404f9d16", + "sha256": "70e780bc99796e1db82fe764b1e7dcb89a86f1e5b3afb1db354de50f2e41eb7a", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.2.1" + "version": "1.2.2" }, "watcher": { "dependency": "transitive", @@ -1828,6 +1828,6 @@ }, "sdks": { "dart": ">=3.6.0 <4.0.0", - "flutter": ">=3.27.1" + "flutter": ">=3.27.3" } }