From f69350d9bb06fee1b7a0301548c2c6d2a8a40848 Mon Sep 17 00:00:00 2001
From: kilianar <mail@kilianar.de>
Date: Sat, 20 Apr 2024 12:03:20 +0200
Subject: [PATCH 1/2] python3Packages.mechanize: disable failing test
 `test_ftp`

---
 pkgs/development/python-modules/mechanize/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/python-modules/mechanize/default.nix b/pkgs/development/python-modules/mechanize/default.nix
index 0f89f3f42525..a92d0ade6e27 100644
--- a/pkgs/development/python-modules/mechanize/default.nix
+++ b/pkgs/development/python-modules/mechanize/default.nix
@@ -45,6 +45,9 @@ buildPythonPackage rec {
     # Tests require network access
     "test_pickling"
     "test_password_manager"
+
+    # https://github.com/python-mechanize/mechanize/issues/94
+    "test_ftp"
   ];
 
   meta = with lib; {

From bee30de1fb36e57942e3294b7759b5e6a5291a3e Mon Sep 17 00:00:00 2001
From: kilianar <mail@kilianar.de>
Date: Sat, 20 Apr 2024 12:08:57 +0200
Subject: [PATCH 2/2] calibre: 7.8.0 -> 7.9.0

https://github.com/kovidgoyal/calibre/releases/tag/v7.9.0
---
 pkgs/applications/misc/calibre/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix
index 3f57531e099d..ce72458f3a0f 100644
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/applications/misc/calibre/default.nix
@@ -32,11 +32,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "calibre";
-  version = "7.8.0";
+  version = "7.9.0";
 
   src = fetchurl {
     url = "https://download.calibre-ebook.com/${finalAttrs.version}/calibre-${finalAttrs.version}.tar.xz";
-    hash = "sha256-FxYuQzzuaWZihSsmeJc6ssG3VBr2YNEi3TkXyyymLUQ=";
+    hash = "sha256-Ilzv4HXW6ZmEVNUWQm04cHZ71FEgjfWVX9IvrfYCHIk=";
   };
 
   patches = [
@@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: {
     (fetchpatch {
       name = "0001-only-plugin-update.patch";
       url = "https://raw.githubusercontent.com/debian-calibre/calibre/debian/${finalAttrs.version}+ds-1/debian/patches/0001-only-plugin-update.patch";
-      hash = "sha256-uL1mSjgCl5ZRLbSuKxJM6XTfvVwog70F7vgKtQzQNEQ=";
+      hash = "sha256-mHZkUoVcoVi9XBOSvM5jyvpOTCcM91g9+Pa/lY6L5p8=";
     })
     (fetchpatch {
       name = "0007-Hardening-Qt-code.patch";