Merge commit '83cbad92d73216bb0d9187c56cce0b91f9121d5a' into main

1 files changed, 20 insertions, 4 deletions

diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/atsim_potentials/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/atsim_potentials/default.nix
index 3bc221d7adc9..8369a49b7db8 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/atsim_potentials/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/atsim_potentials/default.nix
@@ -1,21 +1,36 @@
 { stdenv
 , buildPythonPackage
 , fetchPypi
+, configparser
+, pyparsing
 , pytest
 , future
+, openpyxl
+, wrapt
 }:
 
 buildPythonPackage rec {
-  version = "0.2.1";
+  version = "0.3.0";
   pname = "atsim.potentials";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "2abdec2fb4e8198f4e0e41634ad86625d5356a4a3f1ba1f41568d0697df8f36f";
+    sha256 = "70082fc40b0ab7565a671c2d764fe3db08bc6ce45da44e1c1e8b77a65d1f7a23";
   };
 
   checkInputs = [ pytest ];
-  propagatedBuildInputs = [ future ];
+  propagatedBuildInputs = [
+    configparser
+    future
+    openpyxl
+    pyparsing
+    wrapt
+  ];
+
+  postPatch = ''
+    substituteInPlace setup.py \
+      --replace "wrapt==1.11.2" "wrapt~=1.11"
+  '';
 
   # tests are not included with release
   doCheck = false;
@@ -25,9 +40,10 @@ buildPythonPackage rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = "https://bitbucket.org/mjdr/atsim_potentials";
+    homepage = "https://github.com/mjdrushton/atsim-potentials";
     description = "Provides tools for working with pair and embedded atom method potential models including tabulation routines for DL_POLY and LAMMPS";
     license = licenses.mit;
     maintainers = [ maintainers.costrouc ];
+    broken = true; # missing cexprtk package
   };
 }