public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #125849 from NixOS/backport-125779-to-release-21.05

Browse Source
This commit is contained in:
Sandro 2021-06-06 01:55:46 +02:00 committed by GitHub
commit f6485e48e0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/development/python-modules/subliminal/default.nix
View File

@ -1,7 +1,6 @@
{ lib { lib
, fetchPypi , fetchPypi
, buildPythonPackage , buildPythonPackage
, isPy3k
, guessit , guessit
, babelfish , babelfish
, enzyme , enzyme
@ -16,7 +15,6 @@
, appdirs , appdirs
, rarfile , rarfile
, pytz , pytz
, futures
, sympy , sympy
, vcrpy , vcrpy
, pytest , pytest
@ -38,7 +36,7 @@ buildPythonPackage rec {
guessit babelfish enzyme beautifulsoup4 requests guessit babelfish enzyme beautifulsoup4 requests
click dogpile_cache stevedore chardet pysrt six click dogpile_cache stevedore chardet pysrt six
appdirs rarfile pytz appdirs rarfile pytz
] ++ lib.optional (!isPy3k) futures; ];
checkInputs = [ checkInputs = [
sympy vcrpy pytest pytest-flakes sympy vcrpy pytest pytest-flakes
@ -47,6 +45,7 @@ buildPythonPackage rec {
# https://github.com/Diaoul/subliminal/pull/963 # https://github.com/Diaoul/subliminal/pull/963
doCheck = false; doCheck = false;
pythonImportsCheck = [ "subliminal" ];
meta = with lib; { meta = with lib; {
homepage = "https://github.com/Diaoul/subliminal"; homepage = "https://github.com/Diaoul/subliminal";

2
pkgs/top-level/python-packages.nix
View File

@ -8006,6 +8006,8 @@ in {
subdownloader = callPackage ../development/python-modules/subdownloader { }; subdownloader = callPackage ../development/python-modules/subdownloader { };
subliminal = callPackage ../development/python-modules/subliminal { };
subunit = callPackage ../development/python-modules/subunit { subunit = callPackage ../development/python-modules/subunit {
inherit (pkgs) subunit cppunit check; inherit (pkgs) subunit cppunit check;
}; };