diff --git a/pkgs/development/python-modules/potentials/default.nix b/pkgs/development/python-modules/potentials/default.nix
index 36aeac395517..df99f4caaa9d 100644
--- a/pkgs/development/python-modules/potentials/default.nix
+++ b/pkgs/development/python-modules/potentials/default.nix
@@ -1,20 +1,24 @@
 {
   lib,
-  bibtexparser,
   buildPythonPackage,
+  fetchPypi,
+  fetchFromGitHub,
+
+  # build-system
+  setuptools,
+
+  # dependencies
+  bibtexparser,
   cdcs,
   datamodeldict,
-  fetchPypi,
   habanero,
   ipywidgets,
   lxml,
   matplotlib,
   numpy,
   pandas,
-  pythonOlder,
   requests,
   scipy,
-  setuptools,
   unidecode,
   xmltodict,
   yabadaba,
@@ -25,11 +29,11 @@ buildPythonPackage rec {
   version = "0.4.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
-
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-7ujcfFa/cweUtCY2MrEh3bTkwAVzvbF+5AJ4fs5o6bE=";
+  src = fetchFromGitHub {
+    owner = "usnistgov";
+    repo = "potentials";
+    tag = "v${version}";
+    hash = "sha256-VDA3dQ34kvrs3XMfC0j3T63KrXlmOa/hPvOni/UkgP4=";
   };
 
   build-system = [ setuptools ];
@@ -56,11 +60,11 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "potentials" ];
 
-  meta = with lib; {
+  meta = {
     description = "Python API database tools for accessing the NIST Interatomic Potentials Repository";
     homepage = "https://github.com/usnistgov/potentials";
     changelog = "https://github.com/usnistgov/potentials/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/yabadaba/default.nix b/pkgs/development/python-modules/yabadaba/default.nix
index 4e748ac1c800..f212cf70b81e 100644
--- a/pkgs/development/python-modules/yabadaba/default.nix
+++ b/pkgs/development/python-modules/yabadaba/default.nix
@@ -1,32 +1,37 @@
 {
   lib,
   buildPythonPackage,
+  fetchFromGitHub,
+
+  # build-system
+  setuptools,
+
+  # dependencies
   cdcs,
   datamodeldict,
-  fetchFromGitHub,
   ipython,
   lxml,
   numpy,
   pandas,
+  pillow,
   pymongo,
-  pytestCheckHook,
-  pythonOlder,
-  setuptools,
   tqdm,
+
+  # tests
+  pytestCheckHook,
+  writableTmpDirAsHomeHook,
 }:
 
 buildPythonPackage rec {
   pname = "yabadaba";
-  version = "0.2.2";
+  version = "0.3.1";
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
-
   src = fetchFromGitHub {
     owner = "usnistgov";
     repo = "yabadaba";
     tag = "v${version}";
-    hash = "sha256-NfvnUrTnOeNfiTMrcRtWU3a/Wb6qsDeQlk5jwZ1OpgI=";
+    hash = "sha256-DpkJvi4w0aoD7RC2IFORy8uZ12TuLdcJxfLaSGyATac=";
   };
 
   build-system = [ setuptools ];
@@ -38,23 +43,23 @@ buildPythonPackage rec {
     lxml
     numpy
     pandas
+    pillow
     pymongo
     tqdm
   ];
 
-  nativeCheckInputs = [ pytestCheckHook ];
+  nativeCheckInputs = [
+    pytestCheckHook
+    writableTmpDirAsHomeHook
+  ];
 
   pythonImportsCheck = [ "yabadaba" ];
 
-  preCheck = ''
-    export HOME=$(mktemp -d);
-  '';
-
-  meta = with lib; {
+  meta = {
     description = "Abstraction layer allowing for common interactions with databases and records";
     homepage = "https://github.com/usnistgov/yabadaba";
     changelog = "https://github.com/usnistgov/yabadaba/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
   };
 }