python3Packages.pytorch-lightning: unbreak

...torchmetrics dependency was missing
2 years ago · 291a12d9a7
parent defebc5bb9
commit 291a12d9a7
2 changed files with 13 additions and 0 deletions
--- a/pkgs/development/python-modules/pytorch-lightning/default.nix
+++ b/pkgs/development/python-modules/pytorch-lightning/default.nix
@ -3,10 +3,13 @@
 , fetchFromGitHub
 , isPy27
 , future
+, fsspec
+, packaging
 , pytestCheckHook
 , pytorch
 , pyyaml
 , tensorboard
+, torchmetrics
 , tqdm }:

 buildPythonPackage rec {
@ -22,11 +25,19 @@ buildPythonPackage rec {
    sha256 = "sha256-GP6/VZuRv8dS5wKQW7RbtOSa2vV9Af2Jp+ioEW3bIgc=";
  };

+  postPatch = ''
+    sed -i '/setuptools==/d' requirements.txt
+    sed -i 's/pyDeprecate==/pyDeprecate>=/' requirements.txt
+  '';
+
  propagatedBuildInputs = [
+    packaging
    future
+    fsspec
    pytorch
    pyyaml
    tensorboard
+    torchmetrics
    tqdm
  ];

--- a/pkgs/development/python-modules/torchmetrics/default.nix
+++ b/pkgs/development/python-modules/torchmetrics/default.nix
@ -10,6 +10,7 @@
 , pytorch
 , pytestCheckHook
 , torchmetrics
+, pytorch-lightning
 }:

 let
@ -37,6 +38,7 @@ buildPythonPackage {
  ];

  checkInputs = [
+    pytorch-lightning
    scikit-learn
    scikitimage
    cloudpickle