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

Merge pull request #31307 from tari/flexget-fix 

flexget: fix build with updated dependencies
This commit is contained in:
Frederik Rietdijk 2017-11-07 08:34:56 +01:00 committed by GitHub
parent 376516f335 030223237a
commit eef5368176
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/applications/networking/flexget/default.nix
View File

@ -24,9 +24,6 @@ buildPythonApplication rec {
# unicode-capable filesystem (and setting LC_ALL doesn't work). # unicode-capable filesystem (and setting LC_ALL doesn't work).
# setlocale: LC_ALL: cannot change locale (en_US.UTF-8) # setlocale: LC_ALL: cannot change locale (en_US.UTF-8)
postPatch = '' postPatch = ''
sed -i '/def test_non_ascii/i\ import pytest\
@pytest.mark.skip' flexget/tests/test_filesystem.py
substituteInPlace requirements.txt \ substituteInPlace requirements.txt \
--replace "chardet==3.0.3" "chardet" \ --replace "chardet==3.0.3" "chardet" \
--replace "rebulk==0.8.2" "rebulk" \ --replace "rebulk==0.8.2" "rebulk" \
@ -35,7 +32,13 @@ buildPythonApplication rec {
--replace "sqlalchemy==1.1.10" "sqlalchemy" \ --replace "sqlalchemy==1.1.10" "sqlalchemy" \
--replace "zxcvbn-python==4.4.15" "zxcvbn-python" \ --replace "zxcvbn-python==4.4.15" "zxcvbn-python" \
--replace "flask-cors==3.0.2" "flask-cors" \ --replace "flask-cors==3.0.2" "flask-cors" \
--replace "certifi==2017.4.17" "certifi" --replace "certifi==2017.4.17" "certifi" \
--replace "apscheduler==3.3.1" "apscheduler" \
--replace "path.py==10.3.1" "path.py" \
--replace "tempora==1.8" "tempora" \
--replace "cheroot==5.5.0" "cheroot" \
--replace "six==1.10.0" "six" \
--replace "aniso8601==1.2.1" "aniso8601"
''; '';
checkPhase = '' checkPhase = ''
@ -47,7 +50,8 @@ buildPythonApplication rec {
and not test_double_episodes \ and not test_double_episodes \
and not test_inject_force \ and not test_inject_force \
and not test_double_prefered \ and not test_double_prefered \
and not test_double" and not test_double \
and not test_non_ascii"
''; '';
buildInputs = [ pytest mock vcrpy pytest-catchlog boto3 ]; buildInputs = [ pytest mock vcrpy pytest-catchlog boto3 ];