diff --git a/pkgs/development/python-modules/isbnlib/default.nix b/pkgs/development/python-modules/isbnlib/default.nix
index afa64d0f522f..a6383e0573b1 100644
--- a/pkgs/development/python-modules/isbnlib/default.nix
+++ b/pkgs/development/python-modules/isbnlib/default.nix
@@ -2,20 +2,28 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  pythonAtLeast,
+
+  # build-system
+  setuptools,
+
+  # tests
   pytestCheckHook,
   pytest-cov-stub,
-  setuptools,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "isbnlib";
   version = "3.10.14";
   pyproject = true;
 
+  # Several tests fail and suggest that the package is incompatible with python >= 3.14
+  disabled = pythonAtLeast "3.14";
+
   src = fetchFromGitHub {
     owner = "xlcnd";
     repo = "isbnlib";
-    rev = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-d6p0wv7kj+NOZJRE2rzQgb7PXv+E3tASIibYCjzCdx8=";
   };
 
@@ -32,8 +40,8 @@ buildPythonPackage rec {
 
   enabledTestPaths = [ "isbnlib/test/" ];
 
-  # All disabled tests require a network connection
   disabledTests = [
+    # Require a network connection
     "test_cache"
     "test_editions_any"
     "test_editions_merge"
@@ -66,8 +74,8 @@ buildPythonPackage rec {
   meta = {
     description = "Extract, clean, transform, hyphenate and metadata for ISBNs";
     homepage = "https://github.com/xlcnd/isbnlib";
-    changelog = "https://github.com/xlcnd/isbnlib/blob/v${version}/CHANGES.txt";
+    changelog = "https://github.com/xlcnd/isbnlib/blob/${finalAttrs.src.tag}/CHANGES.txt";
     license = lib.licenses.lgpl3Plus;
     maintainers = with lib.maintainers; [ dotlambda ];
   };
-}
+})
diff --git a/pkgs/development/python-modules/papis/default.nix b/pkgs/development/python-modules/papis/default.nix
index 2a6a1f2ee37a..b4e0f5e341d2 100644
--- a/pkgs/development/python-modules/papis/default.nix
+++ b/pkgs/development/python-modules/papis/default.nix
@@ -3,6 +3,7 @@
   buildPythonPackage,
   fetchFromGitHub,
   fetchpatch2,
+  pythonAtLeast,
 
   # build-system
   hatchling,
@@ -45,16 +46,26 @@
   pytest-cov-stub,
   sphinx,
   sphinx-click,
+  writableTmpDirAsHomeHook,
 }:
-buildPythonPackage rec {
+
+buildPythonPackage (finalAttrs: {
   pname = "papis";
   version = "0.14.1";
   pyproject = true;
 
+  patches = [
+    (fetchpatch2 {
+      name = "fix-support-new-click-in-papisrunner.patch";
+      url = "https://github.com/papis/papis/commit/0e3ffff4bd1b62cdf0a9fdc7f54d6a2e2ab90082.patch?full_index=1";
+      hash = "sha256-KUw5U5izTTWqXHzGWLibtqHWAsVxla6SA8x6SJ07/zU=";
+    })
+  ];
+
   src = fetchFromGitHub {
     owner = "papis";
     repo = "papis";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-V4YswLNYwfBYe/Td0PEeDG++ClZoF08yxXjUXuyppPI=";
   };
 
@@ -81,7 +92,7 @@ buildPythonPackage rec {
     requests
     stevedore
   ]
-  ++ lib.optionals withOptDeps optional-dependencies.complete;
+  ++ lib.optionals withOptDeps finalAttrs.passthru.optional-dependencies.complete;
 
   optional-dependencies = {
     complete = [
@@ -102,12 +113,9 @@ buildPythonPackage rec {
     pytest-cov-stub
     sphinx
     sphinx-click
+    writableTmpDirAsHomeHook
   ];
 
-  preCheck = ''
-    export HOME=$(mktemp -d);
-  '';
-
   enabledTestPaths = [
     "papis"
     "tests"
@@ -126,23 +134,15 @@ buildPythonPackage rec {
     "test_git_cli"
   ];
 
-  patches = [
-    (fetchpatch2 {
-      name = "fix-support-new-click-in-papisrunner.patch";
-      url = "https://github.com/papis/papis/commit/0e3ffff4bd1b62cdf0a9fdc7f54d6a2e2ab90082.patch?full_index=1";
-      hash = "sha256-KUw5U5izTTWqXHzGWLibtqHWAsVxla6SA8x6SJ07/zU=";
-    })
-  ];
-
   meta = {
     description = "Powerful command-line document and bibliography manager";
     mainProgram = "papis";
     homepage = "https://papis.readthedocs.io/";
-    changelog = "https://github.com/papis/papis/blob/${src.tag}/CHANGELOG.md";
+    changelog = "https://github.com/papis/papis/blob/${finalAttrs.src.tag}/CHANGELOG.md";
     license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [
       nico202
       teto
     ];
   };
-}
+})