diff options
| author | lassulus <lassulus@lassul.us> | 2021-06-05 12:30:41 +0200 |
|---|---|---|
| committer | github-actions[bot] <github-actions[bot]@users.noreply.github.com> | 2021-06-05 21:31:27 +0000 |
| commit | f604d15d1546b86da0d5bf1c93583b562701d3f7 (patch) | |
| tree | 1071f160d6c8d6269fb89aae5ad943bd15fe3cc9 | |
| parent | Merge pull request #125621 from etu/backport-php-upgrades (diff) | |
| download | nixpkgs-f604d15d1546b86da0d5bf1c93583b562701d3f7.tar.gz | |
python3Packages.subliminal: readd again
(cherry picked from commit c78fe7aa78e7f562f6bd4a3f213236640f97448c)
| -rw-r--r-- | pkgs/development/python-modules/subliminal/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 2 |
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 20a970ec6b47..181837dc9968 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8006,6 +8006,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; }; |