From 9d00b012d9699d50e43bab85da35dfbb1bd9ea1f Mon Sep 17 00:00:00 2001
From: aucub <78630225+aucub@users.noreply.github.com>
Date: Sat, 18 Jan 2025 20:07:02 +0800
Subject: [PATCH] venera: 1.1.3 -> 1.2.0

---
 pkgs/by-name/ve/venera/package.nix       | 39 +++++++++++++++-----
 pkgs/by-name/ve/venera/pubspec.lock.json | 47 ++++++++++++++++++++----
 pkgs/by-name/ve/venera/update.sh         | 20 ----------
 3 files changed, 68 insertions(+), 38 deletions(-)
 delete mode 100755 pkgs/by-name/ve/venera/update.sh

diff --git a/pkgs/by-name/ve/venera/package.nix b/pkgs/by-name/ve/venera/package.nix
index 4bed65e02238..5cf07681d79b 100644
--- a/pkgs/by-name/ve/venera/package.nix
+++ b/pkgs/by-name/ve/venera/package.nix
@@ -3,26 +3,32 @@
   fetchFromGitHub,
   flutter327,
   webkitgtk_4_1,
-  pkg-config,
   copyDesktopItems,
   makeDesktopItem,
+  runCommand,
+  venera,
+  yq,
+  _experimental-update-script-combinators,
+  gitUpdater,
 }:
+
 flutter327.buildFlutterApplication rec {
   pname = "venera";
-  version = "1.1.3";
+  version = "1.2.0";
 
   src = fetchFromGitHub {
     owner = "venera-app";
     repo = "venera";
     tag = "v${version}";
-    hash = "sha256-zjlu+rdS+ctp8R1laeT9OF+HCLvTyQsAJIBA1fEiNMg=";
+    hash = "sha256-RqrddFzd0+TePVupqVwTjlt/Jpwi++J3JCsltW6KORo=";
   };
 
   pubspecLock = lib.importJSON ./pubspec.lock.json;
 
   gitHashes = {
     desktop_webview_window = "sha256-15tw3gLN9e886QjBFuYP34KLD1lN8AmQYXVza5Bvs40=";
-    flutter_qjs = "sha256-SvOgcZquwZ1/HWVkPVnD8Eo+jD3jjfkKsVleJpNaiV0=";
+    flutter_qjs = "sha256-nbXKfiCvG6JT570RNVq3gec+JFw3H7XG4g/QSNkDw18=";
+    flutter_7zip = "sha256-KHDq4XG3l+dq1NPW84wOK5kKbXJ8qCK8voGeTnX/Krw=";
     lodepng_flutter = "sha256-bGc9uXD1EQ/19OIZmR7a/YL9w93fNWdQF5S19LSwxZw=";
     photo_view = "sha256-Z+9xgvk8YS+bgCbBW7BBY72tV6JUq2kCX5OwKFK4YPE=";
     scrollable_positioned_list = "sha256-6XmBlNxE7DEqY2LsEFtVrshn2Xt55XnmaiTq+tiPInA=";
@@ -32,7 +38,6 @@ flutter327.buildFlutterApplication rec {
 
   nativeBuildInputs = [
     copyDesktopItems
-    pkg-config
   ];
 
   buildInputs = [
@@ -57,15 +62,29 @@ flutter327.buildFlutterApplication rec {
     })
   ];
 
-  extraWrapProgramArgs = ''
-    --prefix LD_LIBRARY_PATH : $out/app/venera/lib
-  '';
-
   postInstall = ''
     install -Dm0644 ./debian/gui/venera.png $out/share/pixmaps/venera.png
   '';
 
-  passthru.updateScript = ./update.sh;
+  extraWrapProgramArgs = ''
+    --prefix LD_LIBRARY_PATH : $out/app/venera/lib
+  '';
+
+  passthru = {
+    pubspecSource =
+      runCommand "pubspec.lock.json"
+        {
+          buildInputs = [ yq ];
+          inherit (venera) src;
+        }
+        ''
+          cat $src/pubspec.lock | yq > $out
+        '';
+    updateScript = _experimental-update-script-combinators.sequence [
+      (gitUpdater { rev-prefix = "v"; })
+      (_experimental-update-script-combinators.copyAttrOutputToFile "venera.pubspecSource" ./pubspec.lock.json)
+    ];
+  };
 
   meta = {
     description = "Comic reader that support reading local and network comics";
diff --git a/pkgs/by-name/ve/venera/pubspec.lock.json b/pkgs/by-name/ve/venera/pubspec.lock.json
index c13e95a43078..4915cf9bf619 100644
--- a/pkgs/by-name/ve/venera/pubspec.lock.json
+++ b/pkgs/by-name/ve/venera/pubspec.lock.json
@@ -377,6 +377,17 @@
       "source": "sdk",
       "version": "0.0.0"
     },
+    "flutter_7zip": {
+      "dependency": "direct main",
+      "description": {
+        "path": ".",
+        "ref": "b33344797f1d2469339e0e1b75f5f954f1da224c",
+        "resolved-ref": "b33344797f1d2469339e0e1b75f5f954f1da224c",
+        "url": "https://github.com/wgh136/flutter_7zip"
+      },
+      "source": "git",
+      "version": "0.0.1"
+    },
     "flutter_file_dialog": {
       "dependency": "direct main",
       "description": {
@@ -507,8 +518,8 @@
       "dependency": "direct main",
       "description": {
         "path": ".",
-        "ref": "1657f62fe7545ac43a339e0a5ee2b82bacd81e9f",
-        "resolved-ref": "1657f62fe7545ac43a339e0a5ee2b82bacd81e9f",
+        "ref": "9c99ac258a11f8e91761a5466a190efba3ca64af",
+        "resolved-ref": "9c99ac258a11f8e91761a5466a190efba3ca64af",
         "url": "https://github.com/wgh136/flutter_qjs"
       },
       "source": "git",
@@ -1080,15 +1091,15 @@
       "source": "hosted",
       "version": "5.0.2"
     },
-    "shimmer": {
+    "shimmer_animation": {
       "dependency": "direct main",
       "description": {
-        "name": "shimmer",
-        "sha256": "5f88c883a22e9f9f299e5ba0e4f7e6054857224976a5d9f839d4ebdc94a14ac9",
+        "name": "shimmer_animation",
+        "sha256": "9357080b7dd892aae837d569e1fbbcbe7f9a02ca994e558561d90e35e92f1101",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.0.0"
+      "version": "2.2.2"
     },
     "sky_engine": {
       "dependency": "transitive",
@@ -1176,6 +1187,16 @@
       "source": "hosted",
       "version": "1.3.0"
     },
+    "syntax_highlight": {
+      "dependency": "direct main",
+      "description": {
+        "name": "syntax_highlight",
+        "sha256": "ee33b6aa82cc722bb9b40152a792181dee222353b486c0255fde666a3e3a4997",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.4.0"
+    },
     "term_glyph": {
       "dependency": "transitive",
       "description": {
@@ -1196,6 +1217,16 @@
       "source": "hosted",
       "version": "0.7.3"
     },
+    "text_scroll": {
+      "dependency": "direct main",
+      "description": {
+        "name": "text_scroll",
+        "sha256": "7869d86a6fdd725dee56bdd150216a99f0372b82fbfcac319214dbd5f36e1908",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.2.0"
+    },
     "typed_data": {
       "dependency": "transitive",
       "description": {
@@ -1401,11 +1432,11 @@
       "dependency": "direct main",
       "description": {
         "name": "zip_flutter",
-        "sha256": "955b53d58709fcd9feefbed3d41b5522bc5273e677603e9fc67017a81e568d24",
+        "sha256": "be21152c35fcb6d0ef4ce89fc3aed681f7adc0db5490ca3eb5893f23fd20e646",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.0.5"
+      "version": "0.0.6"
     }
   },
   "sdks": {
diff --git a/pkgs/by-name/ve/venera/update.sh b/pkgs/by-name/ve/venera/update.sh
deleted file mode 100755
index 7d9761ca3a5d..000000000000
--- a/pkgs/by-name/ve/venera/update.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/usr/bin/env nix-shell
-#!nix-shell -I nixpkgs=./. -i bash -p curl gnused jq yq nix bash coreutils nix-update
-
-set -eou pipefail
-
-ROOT="$(dirname "$(readlink -f "$0")")"
-
-latestTag=$(curl ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} -sL https://api.github.com/repos/venera-app/venera/releases/latest | jq --raw-output .tag_name)
-latestVersion=$(echo "$latestTag" | sed 's/^v//')
-
-currentVersion=$(nix-instantiate --eval -E "with import ./. {}; venera.version or (lib.getVersion venera)" | tr -d '"')
-
-if [[ "$currentVersion" == "$latestVersion" ]]; then
-    echo "package is up-to-date: $currentVersion"
-    exit 0
-fi
-
-nix-update venera
-
-curl https://raw.githubusercontent.com/venera-app/venera/${latestTag}/pubspec.lock | yq . >$ROOT/pubspec.lock.json