diff --git a/pkgs/by-name/fi/finamp/git-hashes.json b/pkgs/by-name/fi/finamp/git-hashes.json new file mode 100644 index 000000000000..6f0c48bd26a5 --- /dev/null +++ b/pkgs/by-name/fi/finamp/git-hashes.json @@ -0,0 +1,13 @@ +{ + "balanced_text": "sha256-U+gtC9AaUFp3gVkUzYMWAUSuUV7kYB8ZE2BsclnxwkA=", + "flutter_user_certificates_android": "sha256-HL1Qd0D3CLYJysWLX2jqWt1FJRGm/BE8EjVFPztOIPo=", + "isar": "sha256-Wg1m/HM7UnK+aC1DOyY41Bo4HuLrEaAxCtQw12ZrnN0=", + "isar_flutter_libs": "sha256-Z5IdfiaZ7348XwYSQb81z0YZEoIHWmsSZr6mYqqz4Oo=", + "isar_generator": "sha256-fM8ygT6il7TdjmeTdmk8o4exc3Z/F1tYF878eoDK37E=", + "just_audio": "sha256-I+HTDx3IpaQw3VBVO7KGzl0vDcFrNZhN5455i7TNxxs=", + "just_audio_media_kit": "sha256-dSlZETFqNQs7jxNN+8MWQzval31zA7zCs+7WiPPPZMw=", + "media_kit_libs_windows_audio": "sha256-XAObjn7wcN4qA7MW+hKqjNZv/L2Ec8t/cTF+d2ZoZ+k=", + "palette_generator": "sha256-mnRJf3asu1mm9HYU8U0di+qRk3SpNFwN3S5QxChpIA0=", + "smtc_windows": "sha256-ESR6qw8ciJvo1YG3wNK7Uy/N0zzl6OX6q40Dmgsvx6A=", + "split_view": "sha256-unTJQDXUUPVDudlk0ReOPNYrsyEpbd/UMg1tHZsmg+k=" +} \ No newline at end of file diff --git a/pkgs/by-name/fi/finamp/package.nix b/pkgs/by-name/fi/finamp/package.nix index 61f0e26d507c..4e2a80b5b16d 100644 --- a/pkgs/by-name/fi/finamp/package.nix +++ b/pkgs/by-name/fi/finamp/package.nix @@ -1,46 +1,42 @@ { lib, stdenv, - flutter338, + flutter341, mpv-unwrapped, patchelf, fetchFromGitHub, copyDesktopItems, makeDesktopItem, + runCommand, + yq, + finamp, + _experimental-update-script-combinators, + nix-update-script, + dart, }: let - version = "0.9.22-beta"; + version = "0.9.23-beta"; in -flutter338.buildFlutterApplication { +flutter341.buildFlutterApplication { inherit version; pname = "finamp"; src = fetchFromGitHub { - owner = "jmshrv"; + owner = "UnicornsOnLSD"; repo = "finamp"; rev = version; - hash = "sha256-SPt1p9+uyvfSry8Ry2BJyLC7HyWZe43wfAPK9BVkcnc="; + hash = "sha256-N1+6rB16geFMYMbfiF7eppnXfXC/pqv90I9aY/57lKI="; }; + pubspecLock = lib.importJSON ./pubspec.lock.json; + gitHashes = lib.importJSON ./git-hashes.json; + nativeBuildInputs = [ patchelf copyDesktopItems ]; buildInputs = [ mpv-unwrapped ]; - gitHashes = { - balanced_text = "sha256-U+gtC9AaUFp3gVkUzYMWAUSuUV7kYB8ZE2BsclnxwkA="; - isar_generator = "sha256-EthUFM+YI3bnM0U0sECoNOCRXpo4qjP71VXYBuO/u+I="; - isar_flutter_libs = "sha256-Z5IdfiaZ7348XwYSQb81z0YZEoIHWmsSZr6mYqqz4Oo="; - media_kit_libs_windows_audio = "sha256-p3hRq79whLFJLNUgL9atXyTGvOIqCbTRKVk1ie0Euqs="; - palette_generator = "sha256-mnRJf3asu1mm9HYU8U0di+qRk3SpNFwN3S5QxChpIA0="; - split_view = "sha256-unTJQDXUUPVDudlk0ReOPNYrsyEpbd/UMg1tHZsmg+k="; - flutter_user_certificates_android = "sha256-HL1Qd0D3CLYJysWLX2jqWt1FJRGm/BE8EjVFPztOIPo="; - smtc_windows = "sha256-ESR6qw8ciJvo1YG3wNK7Uy/N0zzl6OX6q40Dmgsvx6A="; - just_audio = "sha256-I+HTDx3IpaQw3VBVO7KGzl0vDcFrNZhN5455i7TNxxs="; - just_audio_media_kit = "sha256-dSlZETFqNQs7jxNN+8MWQzval31zA7zCs+7WiPPPZMw="; - }; - postFixup = '' patchelf $out/app/$pname/finamp --add-needed libisar.so --add-needed libmpv.so --add-needed libflutter_discord_rpc.so --add-rpath ${ lib.makeLibraryPath [ mpv-unwrapped ] @@ -70,11 +66,42 @@ flutter338.buildFlutterApplication { }) ]; + passthru = { + pubspecSource = + runCommand "pubspec.lock.json" + { + nativeBuildInputs = [ yq ]; + inherit (finamp) src; + } + '' + cat $src/pubspec.lock | yq > $out + ''; + updateScript = _experimental-update-script-combinators.sequence [ + (nix-update-script { extraArgs = [ "--version=unstable" ]; }) + ( + (_experimental-update-script-combinators.copyAttrOutputToFile "finamp.pubspecSource" ./pubspec.lock.json) + // { + supportedFeatures = [ ]; + } + ) + { + command = [ + dart.fetchGitHashesScript + "--input" + ./pubspec.lock.json + "--output" + ./git-hashes.json + ]; + supportedFeatures = [ ]; + } + ]; + }; + meta = { - # Finamp depends on `ìsar`, which for Linux is only compiled for x86_64. https://github.com/jmshrv/finamp/issues/766 + # Finamp depends on `ìsar`, which for Linux is only compiled for x86_64. https://github.com/UnicornsOnLSD/finamp/issues/766 broken = stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isx86_64; description = "Open source Jellyfin music player"; - homepage = "https://github.com/jmshrv/finamp"; + homepage = "https://github.com/UnicornsOnLSD/finamp"; license = lib.licenses.mpl20; maintainers = with lib.maintainers; [ dseelp ]; mainProgram = "finamp"; diff --git a/pkgs/by-name/fi/finamp/pubspec.lock.json b/pkgs/by-name/fi/finamp/pubspec.lock.json index 517986f5ff6d..1a20e4851435 100644 --- a/pkgs/by-name/fi/finamp/pubspec.lock.json +++ b/pkgs/by-name/fi/finamp/pubspec.lock.json @@ -30,6 +30,16 @@ "source": "hosted", "version": "0.13.0" }, + "ansicolor": { + "dependency": "transitive", + "description": { + "name": "ansicolor", + "sha256": "50e982d500bc863e1d703448afdbf9e5a72eb48840a4f766fa361ffd6877055f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.3" + }, "app_links": { "dependency": "direct main", "description": { @@ -325,11 +335,11 @@ "dependency": "transitive", "description": { "name": "characters", - "sha256": "f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803", + "sha256": "faf38497bda5ead2a8c7615f4f7939df04333478bf32e4173fcb06d428b5716b", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.4.0" + "version": "1.4.1" }, "checked_yaml": { "dependency": "transitive", @@ -491,6 +501,16 @@ "source": "hosted", "version": "3.0.7" }, + "csslib": { + "dependency": "transitive", + "description": { + "name": "csslib", + "sha256": "09bad715f418841f976c77db72d5398dc1253c21fb9c0c7f0b0b985860b2d58e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.2" + }, "custom_lint": { "dependency": "direct dev", "description": { @@ -773,6 +793,16 @@ "source": "sdk", "version": "0.0.0" }, + "flutter_native_splash": { + "dependency": "direct dev", + "description": { + "name": "flutter_native_splash", + "sha256": "4fb9f4113350d3a80841ce05ebf1976a36de622af7d19aca0ca9a9911c7ff002", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.7" + }, "flutter_plugin_android_lifecycle": { "dependency": "transitive", "description": { @@ -1006,6 +1036,16 @@ "source": "hosted", "version": "4.3.0" }, + "html": { + "dependency": "transitive", + "description": { + "name": "html", + "sha256": "6d1264f2dffa1b1101c25a91dff0dc2daee4c18e87cd8538729773c073dbf602", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.15.6" + }, "http": { "dependency": "direct main", "description": { @@ -1089,18 +1129,19 @@ "isar": { "dependency": "direct main", "description": { - "name": "isar", - "sha256": "99165dadb2cf2329d3140198363a7e7bff9bbd441871898a87e26914d25cf1ea", - "url": "https://pub.dev" + "path": "packages/isar", + "ref": "a602cd8999048faba043f7e1ce7ba92f4d812762", + "resolved-ref": "a602cd8999048faba043f7e1ce7ba92f4d812762", + "url": "https://github.com/Komodo5197/isar-community.git" }, - "source": "hosted", + "source": "git", "version": "3.1.0+1" }, "isar_flutter_libs": { "dependency": "direct main", "description": { "path": ".", - "ref": "HEAD", + "ref": "59103190aa2ac03041d61ad6d127b540be079ec8", "resolved-ref": "59103190aa2ac03041d61ad6d127b540be079ec8", "url": "https://github.com/MrLittleWhite/isar_flutter_libs.git" }, @@ -1284,21 +1325,21 @@ "dependency": "transitive", "description": { "name": "matcher", - "sha256": "dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2", + "sha256": "12956d0ad8390bbcc63ca2e1469c0619946ccb52809807067a7020d57e647aa6", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.12.17" + "version": "0.12.18" }, "material_color_utilities": { "dependency": "transitive", "description": { "name": "material_color_utilities", - "sha256": "f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec", + "sha256": "9c337007e82b1889149c82ed242ed1cb24a66044e30979c44912381e9be4c48b", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.11.1" + "version": "0.13.0" }, "media_kit": { "dependency": "transitive", @@ -2114,11 +2155,11 @@ "dependency": "transitive", "description": { "name": "test_api", - "sha256": "ab2726c1a94d3176a45960b6234466ec367179b87dd74f1611adb1f3b5fb9d55", + "sha256": "93167629bfc610f71560ab9312acdda4959de4df6fac7492c89ff0d3886f6636", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.7.7" + "version": "0.7.9" }, "threshold": { "dependency": "transitive",