Merge pull request #119529 from Lassulus/searx_1.0.0

searx: 0.18.0 -> 1.0.0
This commit is contained in:
Michele Guerini Rocco 2021-04-19 00:38:09 +02:00 committed by GitHub
commit 27b95afbb8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 29 additions and 15 deletions

View file

@ -108,7 +108,7 @@ import ./make-test-python.nix ({ pkgs, ...} :
"${pkgs.curl}/bin/curl --fail http://localhost/searx >&2"
)
fancy.succeed(
"${pkgs.curl}/bin/curl --fail http://localhost/searx/static/js/bootstrap.min.js >&2"
"${pkgs.curl}/bin/curl --fail http://localhost/searx/static/themes/oscar/js/bootstrap.min.js >&2"
)
'';
})

View file

@ -1,23 +1,21 @@
{ lib, nixosTests, python3, python3Packages, fetchFromGitHub, fetchpatch }:
{ lib, nixosTests, python3, python3Packages, fetchFromGitHub }:
with python3Packages;
toPythonModule (buildPythonApplication rec {
pname = "searx";
version = "0.18.0";
version = "1.0.0";
# Can not use PyPI because certain test files are missing.
# pypi doesn't receive updates
src = fetchFromGitHub {
owner = "searx";
repo = "searx";
rev = "v${version}";
sha256 = "0idxspvckvsd02v42h4z4wqrfkn1l8n59i91f7pc837cxya8p6hn";
sha256 = "0ghkx8g8jnh8yd46p4mlbjn2zm12nx27v7qflr4c8xhlgi0px0mh";
};
postPatch = ''
sed -i 's/==.*$//' requirements.txt
# skip failing test
sed -i '/test_json_serial(/,+3d' tests/unit/test_standalone_searx.py
'';
preBuild = ''
@ -25,16 +23,32 @@ toPythonModule (buildPythonApplication rec {
'';
propagatedBuildInputs = [
pyyaml lxml grequests flaskbabel flask requests
gevent speaklater Babel pytz dateutil pygments
pyasn1 pyasn1-modules ndg-httpsclient certifi pysocks
jinja2 werkzeug
Babel
certifi
dateutil
flask
flaskbabel
gevent
grequests
jinja2
langdetect
lxml
ndg-httpsclient
pyasn1
pyasn1-modules
pygments
pysocks
pytz
pyyaml
requests
speaklater
werkzeug
];
checkInputs = [
Babel mock nose2 covCore pep8 plone-testing splinter
unittest2 zope_testrunner selenium
];
# tests try to connect to network
doCheck = false;
pythonImportsCheck = [ "searx" ];
postInstall = ''
# Create a symlink for easier access to static data