From c1be0ca3bacea8880e5e275b11b906ae234f3f85 Mon Sep 17 00:00:00 2001 From: lucasew Date: Sat, 11 May 2024 14:04:48 -0300 Subject: [PATCH 1/2] flet-client-flutter: final form for the update script Signed-off-by: lucasew --- .../fl/flet-client-flutter/package.nix | 20 +++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fl/flet-client-flutter/package.nix b/pkgs/by-name/fl/flet-client-flutter/package.nix index 8404c0ff24f5..2e00e9802bfc 100644 --- a/pkgs/by-name/fl/flet-client-flutter/package.nix +++ b/pkgs/by-name/fl/flet-client-flutter/package.nix @@ -7,9 +7,13 @@ , makeWrapper , mimalloc , orc -, nix-update-script +, yq +, runCommand +, gitUpdater , mpv-unwrapped , libplacebo +, _experimental-update-script-combinators +, flet-client-flutter }: flutter.buildFlutterApplication rec { @@ -51,7 +55,19 @@ flutter.buildFlutterApplication rec { ++ libplacebo.buildInputs ; - passthru.updateScript = nix-update-script { }; + passthru = { + pubspecSource = runCommand "pubspec.lock.json" { + buildInputs = [ yq ]; + inherit (flet-client-flutter) src; + } '' + cat $src/client/pubspec.lock | yq > $out + ''; + + updateScript = _experimental-update-script-combinators.sequence [ + (gitUpdater { rev-prefix = "v"; }) + (_experimental-update-script-combinators.copyAttrOutputToFile "flet-client-flutter.pubspecSource" ./pubspec.lock.json) + ]; + }; meta = { description = "A framework that enables you to easily build realtime web, mobile, and desktop apps in Python. The frontend part"; From f6846e92623ba8fec8551d226c6d20d619001270 Mon Sep 17 00:00:00 2001 From: lucasew Date: Sat, 11 May 2024 14:11:54 -0300 Subject: [PATCH 2/2] flet-client-flutter: 0.22.0 -> 0.22.1 Signed-off-by: lucasew --- .../fl/flet-client-flutter/package.nix | 4 +-- .../fl/flet-client-flutter/pubspec.lock.json | 32 ++++++++++++------- 2 files changed, 23 insertions(+), 13 deletions(-) diff --git a/pkgs/by-name/fl/flet-client-flutter/package.nix b/pkgs/by-name/fl/flet-client-flutter/package.nix index 2e00e9802bfc..949e6f929575 100644 --- a/pkgs/by-name/fl/flet-client-flutter/package.nix +++ b/pkgs/by-name/fl/flet-client-flutter/package.nix @@ -18,13 +18,13 @@ flutter.buildFlutterApplication rec { pname = "flet-client-flutter"; - version = "0.22.0"; + version = "0.22.1"; src = fetchFromGitHub { owner = "flet-dev"; repo = "flet"; rev = "v${version}"; - hash = "sha256-uN6PxgltbGlSocF561W6Dpo9cPOsvGAsRwZ8nER+5x4="; + hash = "sha256-mjqPIm4LspW1LB4H08FVwEN0JOwTPTLaUxOjZ3n6u8A="; }; sourceRoot = "${src.name}/client"; diff --git a/pkgs/by-name/fl/flet-client-flutter/pubspec.lock.json b/pkgs/by-name/fl/flet-client-flutter/pubspec.lock.json index bc937946c2b8..9fbdb49633be 100644 --- a/pkgs/by-name/fl/flet-client-flutter/pubspec.lock.json +++ b/pkgs/by-name/fl/flet-client-flutter/pubspec.lock.json @@ -170,6 +170,16 @@ "source": "hosted", "version": "3.1.1" }, + "cross_file": { + "dependency": "transitive", + "description": { + "name": "cross_file", + "sha256": "55d7b444feb71301ef6b8838dbc1ae02e63dd48c8773f3810ff53bb1e2945b32", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.3.4+1" + }, "crypto": { "dependency": "transitive", "description": { @@ -244,11 +254,11 @@ "dependency": "transitive", "description": { "name": "file_picker", - "sha256": "4e42aacde3b993c5947467ab640882c56947d9d27342a5b6f2895b23956954a6", + "sha256": "29c90806ac5f5fb896547720b73b17ee9aed9bba540dc5d91fe29f8c5745b10a", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.1.1" + "version": "8.0.3" }, "fixnum": { "dependency": "transitive", @@ -277,7 +287,7 @@ "relative": true }, "source": "path", - "version": "0.22.0" + "version": "0.22.1" }, "flet_audio": { "dependency": "direct main", @@ -286,7 +296,7 @@ "relative": true }, "source": "path", - "version": "0.22.0" + "version": "0.22.1" }, "flet_audio_recorder": { "dependency": "direct main", @@ -295,7 +305,7 @@ "relative": true }, "source": "path", - "version": "0.22.0" + "version": "0.22.1" }, "flet_lottie": { "dependency": "direct main", @@ -304,7 +314,7 @@ "relative": true }, "source": "path", - "version": "0.22.0" + "version": "0.22.1" }, "flet_rive": { "dependency": "direct main", @@ -313,7 +323,7 @@ "relative": true }, "source": "path", - "version": "0.22.0" + "version": "0.22.1" }, "flet_video": { "dependency": "direct main", @@ -322,7 +332,7 @@ "relative": true }, "source": "path", - "version": "0.22.0" + "version": "0.22.1" }, "flet_webview": { "dependency": "direct main", @@ -331,7 +341,7 @@ "relative": true }, "source": "path", - "version": "0.22.0" + "version": "0.22.1" }, "flutter": { "dependency": "direct main", @@ -1445,11 +1455,11 @@ "dependency": "transitive", "description": { "name": "web", - "sha256": "1d9158c616048c38f712a6646e317a3426da10e884447626167240d45209cbad", + "sha256": "97da13628db363c635202ad97068d47c5b8aa555808e7a9411963c533b449b27", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.5.0" + "version": "0.5.1" }, "web_socket_channel": { "dependency": "transitive",