manga-tui: 0.3.1 -> 0.4.0 (#353060)

NixOS · Nov 8, 2024 · e195ee5 · e195ee5
2 parents ae63778 + 9615e31
commit e195ee5
Show file tree

Hide file tree

Showing 3 changed files with 69 additions and 4 deletions.
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
@@ -24076,6 +24076,13 @@
     github = "youhaveme9";
     githubId = 58213083;
   };
+  youwen5 = {
+    name = "Youwen Wu";
+    email = "[email protected]";
+    github = "youwen5";
+    githubId = 38934577;
+    keys = [ { fingerprint = "8F5E 6C1A F909 76CA 7102 917A 8656 58ED 1FE6 1EC3"; } ];
+  };
   yrashk = {
     email = "[email protected]";
     github = "yrashk";

diff --git a/pkgs/by-name/ma/manga-tui/0001-fix-remove-flaky-test.patch b/pkgs/by-name/ma/manga-tui/0001-fix-remove-flaky-test.patch
@@ -0,0 +1,42 @@
+From e84ddb20ca6b99ec2bf84bb3c3cfc3cdbbfd5ff2 Mon Sep 17 00:00:00 2001
+From: Youwen Wu <[email protected]>
+Date: Wed, 6 Nov 2024 02:11:30 -0800
+Subject: [PATCH] fix: remove flaky test
+
+---
+ src/view/pages/manga.rs | 21 ---------------------
+ 1 file changed, 21 deletions(-)
+
+diff --git a/src/view/pages/manga.rs b/src/view/pages/manga.rs
+index 119d9ea..7179a22 100644
+--- a/src/view/pages/manga.rs
++++ b/src/view/pages/manga.rs
+@@ -1853,25 +1853,4 @@ mod test {
+         assert_eq!(manga_page.bookmark_state.phase, BookmarkPhase::SearchingFromApi);
+         assert_eq!(expected, result)
+     }
+-
+-    #[tokio::test]
+-    async fn it_sends_event_chapter_bookmarked_failed_to_fetch() {
+-        let (tx, _) = unbounded_channel();
+-        let mut manga_page = MangaPage::new(Manga::default(), None).with_global_sender(tx);
+-
+-        flush_events(&mut manga_page);
+-
+-        let api_client = TestApiClient::with_failing_response();
+-
+-        manga_page.fetch_chapter_bookmarked(ChapterBookmarked::default(), api_client);
+-
+-        let expected = MangaPageEvents::FetchBookmarkFailed;
+-
+-        let result = timeout(Duration::from_millis(250), manga_page.local_event_rx.recv())
+-            .await
+-            .unwrap()
+-            .unwrap();
+-
+-        assert_eq!(expected, result);
+-    }
+ }
+-- 
+2.46.1
+
diff --git a/pkgs/by-name/ma/manga-tui/package.nix b/pkgs/by-name/ma/manga-tui/package.nix
@@ -3,13 +3,15 @@
   rustPlatform,
   fetchFromGitHub,
   pkg-config,
+  fetchpatch,
   openssl,
   sqlite,
   stdenv,
   darwin,
+  nix-update-script,
 }:
 let
-  version = "0.3.1";
+  version = "0.4.0";
 in
 rustPlatform.buildRustPackage {
   pname = "manga-tui";
@@ -19,10 +21,19 @@ rustPlatform.buildRustPackage {
     owner = "josueBarretogit";
     repo = "manga-tui";
     rev = "v${version}";
-    hash = "sha256-672AuQWviwihnUS3G0xSn4IAMHy0fPE1VLDfu8wrPGg=";
+    hash = "sha256-Se0f5jfYBmvemrYRKduDr1yT3fB2wfQP1fDpa/qrYlI=";
   };
 
-  cargoHash = "sha256-yf0hISz/jHtrO1clTSIKfxFiwI+W0Mu3mY+XW6+ynJU=";
+  patches = [
+    # apply patches to fix failing tests <https://github.com/josueBarretogit/manga-tui/pull/56>
+    (fetchpatch {
+      url = "https://github.com/josueBarretogit/manga-tui/commit/131a5208e6a3d74a9ad852baab75334e4a1ebf34.patch";
+      hash = "sha256-RIliZcaRVUOb33Cl+uBkMH4b34S1JpvnPGv+QCFQZ58=";
+    })
+    ./0001-fix-remove-flaky-test.patch
+  ];
+
+  cargoHash = "sha256-IufJPCvUEWR5p4PrFlaiQPW9wyIFj/Pd/JHki69L6Es=";
 
   nativeBuildInputs = [ pkg-config ];
 
@@ -44,7 +55,12 @@ rustPlatform.buildRustPackage {
     homepage = "https://github.com/josueBarretogit/manga-tui";
     changelog = "https://github.com/josueBarretogit/manga-tui/releases/tag/v${version}";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ isabelroses ];
+    maintainers = with lib.maintainers; [
+      isabelroses
+      youwen5
+    ];
     mainProgram = "manga-tui";
   };
+
+  passthru.updateScript = nix-update-script { };
 }