[Backport release-24.11] butterfly: 2.2.2 -> 2.2.3 (#371485)

NixOS · Jan 11, 2025 · 8683750 · 8683750
2 parents d6be80f + 1124d2e
commit 8683750
Show file tree

Hide file tree

Showing 4 changed files with 211 additions and 234 deletions.
diff --git a/pkgs/by-name/bu/butterfly/package.nix b/pkgs/by-name/bu/butterfly/package.nix
@@ -1,49 +1,52 @@
 {
   lib,
   fetchFromGitHub,
-  flutter,
+  flutter327,
 }:
-let
-  version = "2.2.2";
+flutter327.buildFlutterApplication rec {
+  pname = "butterfly";
+  version = "2.2.3";
+
   src = fetchFromGitHub {
     owner = "LinwoodDev";
     repo = "Butterfly";
-    rev = "refs/tags/v${version}";
-    hash = "sha256-tq2pBvGHDdZoi2EMgBIgNgsg3Ovh2PLCvET98oB+7Sw=";
+    tag = "v${version}";
+    hash = "sha256-sAgCP31Qd9XKTOvVLTazx3fqKF/FAd9WEwfcmgVqD38=";
   };
-in
-flutter.buildFlutterApplication {
-  pname = "butterfly";
-  inherit version src;
 
   pubspecLock = lib.importJSON ./pubspec.lock.json;
 
   sourceRoot = "${src.name}/app";
 
   gitHashes = {
     dart_leap = "sha256-eEyUqdVToybQoDwdmz47H0f3/5zRdJzmPv1d/5mTOgA=";
-    lw_file_system = "sha256-qglyQu/Qu4F0z//hhVmCMHKuh9GclBKLC8G+qKFhd24=";
+    lw_file_system = "sha256-0LLSADBWq19liQLtJIJEuTEqmeyIWP61zRRjjpdV6SM=";
     flutter_secure_storage_web = "sha256-ULYXcFjz9gKMjw1Q1KAmX2J7EcE8CbW0MN/EnwmaoQY=";
     networker = "sha256-1b8soPRbHOGAb2wpsfw/uETnAlaCJZyLmynVRDX9Y8s=";
-    lw_file_system_api = "sha256-OOLbqKLvgHUJf3LiiQoHJS6kngnWtHPhswM69sX5fwE=";
-    lw_sysapi = "sha256-9hCAYB5tqYKQPHGa7+Zma6fE8Ei08RvyL9d65FMuI+I=";
-    flex_color_scheme = "sha256-MYEiiltevfz0gDag3yS/ZjeVaJyl1JMS8zvgI0k4Y0k=";
-    material_leap = "sha256-eEwyu7qn3oMQl5q7Mbunxwwhnk5EuM3mNqnZUcZIpFw=";
+    lw_file_system_api = "sha256-ctz9+HEWGV47XUWa+RInS2gHnkrJQqgafnrbI8m3Yfo=";
+    lw_sysapi = "sha256-OYVHBiAshYKRH/6BEcY+BXm9VIfSAFnFBOBWlQIO5Tc=";
+    material_leap = "sha256-MF0wN4JsmKVzwwWjBKqY0DaLLdUuY0abyLF1VilTslM=";
     networker_socket = "sha256-8LRyo5HzreUMGh5j39vL+Gqzxp4MN/jhHYpDxbFV0Ao=";
     perfect_freehand = "sha256-dMJ8CyhoQWbBRvUQyzPc7vdAhCzcAl1X7CcaT3u6dWo=";
+    pdf = "sha256-cIBSgePv5LIFRbc7IIx1fSVJceGEmzdZzDkOiD1z92E=";
+    pdf_widget_wrapper = "sha256-hXDFdgyu2DvIqwVBvk6TVDW+FdlMGAn5v5JZKQwp8fA=";
+    reorderable_grid = "sha256-g30DSPL/gsk0r8c2ecoKU4f1P3BF15zLnBVO6RXvDGQ=";
   };
 
   postInstall = ''
     cp -r linux/debian/usr/share $out/share
   '';
 
+  passthru.updateScript = ./update.sh;
+
   meta = {
     description = "Powerful, minimalistic, cross-platform, opensource note-taking app";
     homepage = "https://github.com/LinwoodDev/Butterfly";
     mainProgram = "butterfly";
     license = with lib.licenses; [
       agpl3Plus
       cc-by-sa-40
+      asl20
     ];
     maintainers = with lib.maintainers; [ aucub ];
     platforms = [