From 155a5240c48db90da93f3fc82693853534f3e5a1 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 9 Jul 2022 22:40:33 +0200
Subject: [PATCH 1/2] python310Packages.qcelemental: add pythonImportsCheck

---
 .../python-modules/qcelemental/default.nix    | 32 ++++++++++++-------
 1 file changed, 21 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/python-modules/qcelemental/default.nix b/pkgs/development/python-modules/qcelemental/default.nix
index d40252c563b7..6032a98f7065 100644
--- a/pkgs/development/python-modules/qcelemental/default.nix
+++ b/pkgs/development/python-modules/qcelemental/default.nix
@@ -1,37 +1,47 @@
 { stdenv
-, buildPythonPackage, lib, fetchPypi
+, buildPythonPackage
+, lib
+, fetchPypi
 , networkx
 , numpy
 , pint
 , pydantic
 , pytestCheckHook
-} :
+, pythonOlder
+}:
 
 buildPythonPackage rec {
   pname = "qcelemental";
   version = "0.25.0";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-v1yu6yBEtgVsheku/8YaIaXrsVgMzcFlWAuySPhYgyQ=";
+    hash = "sha256-v1yu6yBEtgVsheku/8YaIaXrsVgMzcFlWAuySPhYgyQ=";
   };
 
   propagatedBuildInputs = [
-    numpy
-    pydantic
-    pint
     networkx
+    numpy
+    pint
+    pydantic
   ];
 
-  checkInputs = [ pytestCheckHook ];
+  checkInputs = [
+    pytestCheckHook
+  ];
 
-  doCheck = true;
+  pythonImportsCheck = [
+    "qcelemental"
+  ];
 
   meta = with lib; {
     broken = stdenv.isDarwin;
-    description = "Periodic table, physical constants, and molecule parsing for quantum chemistry";
-    homepage = "http://docs.qcarchive.molssi.org/projects/qcelemental/en/latest/";
+    description = "Periodic table, physical constants and molecule parsing for quantum chemistry";
+    homepage = "http://docs.qcarchive.molssi.org/projects/qcelemental/";
     license = licenses.bsd3;
-    maintainers = [ maintainers.sheepforce ];
+    maintainers = with maintainers; [ sheepforce ];
   };
 }

From 205341353556b628920c9141e60ca4ec1c327b19 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 9 Jul 2022 22:43:44 +0200
Subject: [PATCH 2/2] python310Packages.qcengine: add pythonImportsCheck

---
 .../python-modules/qcengine/default.nix       | 31 ++++++++++++-------
 1 file changed, 19 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/python-modules/qcengine/default.nix b/pkgs/development/python-modules/qcengine/default.nix
index 0a2c32ca9110..2290bfbc3247 100644
--- a/pkgs/development/python-modules/qcengine/default.nix
+++ b/pkgs/development/python-modules/qcengine/default.nix
@@ -1,19 +1,26 @@
-{ buildPythonPackage
-, lib
+{ lib
+, buildPythonPackage
 , fetchPypi
 , psutil
 , py-cpuinfo
 , pydantic
+, pytestCheckHook
+, pythonOlder
 , pyyaml
 , qcelemental
-, pytestCheckHook
 }:
 
 buildPythonPackage rec {
   pname = "qcengine";
   version = "0.24.0";
+  format = "setuptools";
 
-  checkInputs = [ pytestCheckHook ];
+  disabled = pythonOlder "3.7";
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-T6/gC3HHCnI3O1Gkj/MdistL93bwymtEfNF6PmA7TN0=";
+  };
 
   propagatedBuildInputs = [
     psutil
@@ -23,18 +30,18 @@ buildPythonPackage rec {
     qcelemental
   ];
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "sha256-T6/gC3HHCnI3O1Gkj/MdistL93bwymtEfNF6PmA7TN0=";
-  };
+  checkInputs = [
+    pytestCheckHook
+  ];
 
-  doCheck = true;
+  pythonImportsCheck = [
+    "qcengine"
+  ];
 
   meta = with lib; {
     description = "Quantum chemistry program executor and IO standardizer (QCSchema) for quantum chemistry";
-    homepage = "http://docs.qcarchive.molssi.org/projects/qcelemental/en/latest/";
+    homepage = "http://docs.qcarchive.molssi.org/projects/qcelemental/";
     license = licenses.bsd3;
-    platforms = [ "x86_64-linux" ];
-    maintainers = [ maintainers.sheepforce ];
+    maintainers = with maintainers; [ sheepforce ];
   };
 }