alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #53554 from rnhmjoj/searx

Browse source 
searx: 0.14.0 -> 0.15.0
This commit is contained in:
Robin Gloster 2019-01-07 13:21:39 +00:00 committed by GitHub
parent 97aba92bcd 985bc6ca5a
commit 16413c05cd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
pkgs/development/python-modules/plone-testing/default.nix
View file

@ -1,6 +1,7 @@
{ lib { lib
, buildPythonPackage , buildPythonPackage
, fetchPypi , fetchPypi
, six
, zope_testing , zope_testing
, setuptools , setuptools
}: }:
@ -14,7 +15,7 @@ buildPythonPackage rec {
sha256 = "db71bde0d4d3c273dbba8c7a2ab259a42f038eca74184da36c5aab61e90e8dd7"; sha256 = "db71bde0d4d3c273dbba8c7a2ab259a42f038eca74184da36c5aab61e90e8dd7";
}; };
propagatedBuildInputs = [ setuptools zope_testing ]; propagatedBuildInputs = [ six setuptools zope_testing ];
# Huge amount of testing dependencies (including Zope2) # Huge amount of testing dependencies (including Zope2)
doCheck = false; doCheck = false;
@ -24,4 +25,4 @@ buildPythonPackage rec {
homepage = https://github.com/plone/plone.testing; homepage = https://github.com/plone/plone.testing;
license = lib.licenses.bsd3; license = lib.licenses.bsd3;
}; };
} }

22
pkgs/servers/web-apps/searx/default.nix
View file

@ -4,26 +4,31 @@ with python3Packages;
buildPythonApplication rec { buildPythonApplication rec {
pname = "searx"; pname = "searx";
version = "0.14.0"; version = "0.15.0";
# Can not use PyPI because certain test files are missing. # Can not use PyPI because certain test files are missing.
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "asciimoo"; owner = "asciimoo";
repo = "searx"; repo = "searx";
rev = "v${version}"; rev = "v${version}";
sha256 = "046xg6xcs1mxgahz7kwf3fsmwd99q3hhms6pdjlvyczidlfhpmxl"; sha256 = "05si0fn57z1g80l6003cs0ypag2m6zyi3dgsi06pvjp066xbrjvd";
}; };
postPatch = '' postPatch = ''
substituteInPlace requirements.txt \ substituteInPlace requirements.txt \
--replace 'certifi==2017.11.5' 'certifi' \ --replace 'certifi==2017.11.5' 'certifi' \
--replace 'flask==0.12.2' 'flask==0.12.*' \ --replace 'flask==1.0.2' 'flask==1.0.*' \
--replace 'flask-babel==0.11.2' 'flask-babel==0.11.*' \ --replace 'flask-babel==0.11.2' 'flask-babel==0.11.*' \
--replace 'lxml==4.1.1' 'lxml==4.1.*' \ --replace 'lxml==4.2.3' 'lxml==4.2.*' \
--replace 'idna==2.5' 'idna' \ --replace 'idna==2.7' 'idna' \
--replace 'pygments==2.1.3' 'pygments>=2.1,<3.0' \ --replace 'pygments==2.1.3' 'pygments>=2.1,<3.0' \
--replace 'pyopenssl==17.4.0' 'pyopenssl' \ --replace 'pyopenssl==18.0.0' 'pyopenssl' \
--replace 'python-dateutil==2.6.1' 'python-dateutil==2.6.*' --replace 'python-dateutil==2.7.3' 'python-dateutil==2.7.*'
substituteInPlace requirements-dev.txt \
--replace 'plone.testing==5.0.0' 'plone.testing' \
--replace 'pep8==1.7.1' 'pep8==1.7.*' \
--replace 'splinter==0.7.5' 'splinter' \
--replace 'selenium==3.5.0' 'selenium'
''; '';
propagatedBuildInputs = [ propagatedBuildInputs = [
@ -33,7 +38,8 @@ buildPythonApplication rec {
]; ];
checkInputs = [ checkInputs = [
splinter mock plone-testing robotsuite unittest2 selenium Babel mock nose2 covCore pep8 plone-testing splinter
unittest2 zope_testrunner selenium
]; ];
preCheck = '' preCheck = ''