about summary refs log tree commit diff
diff options
context:
space:
mode:
authorlassulus <lassulus@lassul.us>2021-06-05 12:30:41 +0200
committerlassulus <lassulus@lassul.us>2021-06-05 20:24:14 +0200
commitc78fe7aa78e7f562f6bd4a3f213236640f97448c (patch)
tree9f2597df1d76cc9bf0796305df4fdd852c243a3b
parent91a247a1f0346a653a025e391527287ec786b0c2 (diff)
downloadnixlib-c78fe7aa78e7f562f6bd4a3f213236640f97448c.tar
nixlib-c78fe7aa78e7f562f6bd4a3f213236640f97448c.tar.gz
nixlib-c78fe7aa78e7f562f6bd4a3f213236640f97448c.tar.bz2
nixlib-c78fe7aa78e7f562f6bd4a3f213236640f97448c.tar.lz
nixlib-c78fe7aa78e7f562f6bd4a3f213236640f97448c.tar.xz
nixlib-c78fe7aa78e7f562f6bd4a3f213236640f97448c.tar.zst
nixlib-c78fe7aa78e7f562f6bd4a3f213236640f97448c.zip
python3Packages.subliminal: readd again
-rw-r--r--pkgs/development/python-modules/subliminal/default.nix5
-rw-r--r--pkgs/top-level/python-packages.nix2
2 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/development/python-modules/subliminal/default.nix b/pkgs/development/python-modules/subliminal/default.nix
index 77ddb125a94b..cedbb7bcf786 100644
--- a/pkgs/development/python-modules/subliminal/default.nix
+++ b/pkgs/development/python-modules/subliminal/default.nix
@@ -1,7 +1,6 @@
 { lib
 , fetchPypi
 , buildPythonPackage
-, isPy3k
 , guessit
 , babelfish
 , enzyme
@@ -16,7 +15,6 @@
 , appdirs
 , rarfile
 , pytz
-, futures
 , sympy
 , vcrpy
 , pytest
@@ -38,7 +36,7 @@ buildPythonPackage rec {
     guessit babelfish enzyme beautifulsoup4 requests
     click dogpile_cache stevedore chardet pysrt six
     appdirs rarfile pytz
-  ] ++ lib.optional (!isPy3k) futures;
+  ];
 
   checkInputs = [
     sympy vcrpy pytest pytest-flakes
@@ -47,6 +45,7 @@ buildPythonPackage rec {
 
   # https://github.com/Diaoul/subliminal/pull/963
   doCheck = false;
+  pythonImportsCheck = [ "subliminal" ];
 
   meta = with lib; {
     homepage = "https://github.com/Diaoul/subliminal";
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d39487bf1ec7..f7010d6bbc55 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8074,6 +8074,8 @@ in {
 
   subdownloader = callPackage ../development/python-modules/subdownloader { };
 
+  subliminal = callPackage ../development/python-modules/subliminal { };
+
   subunit = callPackage ../development/python-modules/subunit {
     inherit (pkgs) subunit cppunit check;
   };