Merge pull request #320935 from drupol/bump/searxng/june-2024
searxng: 0-unstable-2024-05-31 -> 0-unstable-2024-06-19
This commit is contained in:
Pol Dellaiera
GitHub
commit
c249dd3eff
@ -834,7 +834,7 @@ in {
|
||||
scrutiny = handleTest ./scrutiny.nix {};
|
||||
sddm = handleTest ./sddm.nix {};
|
||||
seafile = handleTest ./seafile.nix {};
|
||||
searx = handleTest ./searx.nix {};
|
||||
searx = runTest ./searx.nix;
|
||||
seatd = handleTest ./seatd.nix {};
|
||||
service-runner = handleTest ./service-runner.nix {};
|
||||
sftpgo = runTest ./sftpgo.nix;
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
import ./make-test-python.nix ({ pkgs, ...} :
|
||||
{ pkgs, ... }:
|
||||
|
||||
{
|
||||
name = "searx";
|
||||
@ -7,108 +7,108 @@ import ./make-test-python.nix ({ pkgs, ...} :
|
||||
};
|
||||
|
||||
# basic setup: searx running the built-in webserver
|
||||
nodes.base = { ... }: {
|
||||
imports = [ ../modules/profiles/minimal.nix ];
|
||||
nodes.base =
|
||||
{ ... }:
|
||||
{
|
||||
services.searx = {
|
||||
enable = true;
|
||||
environmentFile = pkgs.writeText "secrets" ''
|
||||
WOLFRAM_API_KEY = sometoken
|
||||
SEARX_SECRET_KEY = somesecret
|
||||
'';
|
||||
|
||||
services.searx = {
|
||||
enable = true;
|
||||
environmentFile = pkgs.writeText "secrets" ''
|
||||
WOLFRAM_API_KEY = sometoken
|
||||
SEARX_SECRET_KEY = somesecret
|
||||
'';
|
||||
|
||||
settings.server =
|
||||
{ port = "8080";
|
||||
settings.server = {
|
||||
port = "8080";
|
||||
bind_address = "0.0.0.0";
|
||||
secret_key = "@SEARX_SECRET_KEY@";
|
||||
};
|
||||
settings.engines = [
|
||||
{ name = "wolframalpha";
|
||||
api_key = "@WOLFRAM_API_KEY@";
|
||||
engine = "wolframalpha_api";
|
||||
}
|
||||
{ name = "startpage";
|
||||
shortcut = "start";
|
||||
}
|
||||
];
|
||||
};
|
||||
settings.engines = [
|
||||
{
|
||||
name = "wolframalpha";
|
||||
api_key = "@WOLFRAM_API_KEY@";
|
||||
engine = "wolframalpha_api";
|
||||
}
|
||||
{
|
||||
name = "startpage";
|
||||
shortcut = "start";
|
||||
}
|
||||
];
|
||||
};
|
||||
|
||||
};
|
||||
};
|
||||
|
||||
# fancy setup: run in uWSGI and use nginx as proxy
|
||||
nodes.fancy = { config, ... }: {
|
||||
imports = [ ../modules/profiles/minimal.nix ];
|
||||
nodes.fancy =
|
||||
{ config, ... }:
|
||||
{
|
||||
services.searx = {
|
||||
enable = true;
|
||||
# searx refuses to run if unchanged
|
||||
settings.server.secret_key = "somesecret";
|
||||
|
||||
services.searx = {
|
||||
enable = true;
|
||||
# searx refuses to run if unchanged
|
||||
settings.server.secret_key = "somesecret";
|
||||
runInUwsgi = true;
|
||||
uwsgiConfig = {
|
||||
# serve using the uwsgi protocol
|
||||
socket = "/run/searx/uwsgi.sock";
|
||||
chmod-socket = "660";
|
||||
|
||||
runInUwsgi = true;
|
||||
uwsgiConfig = {
|
||||
# serve using the uwsgi protocol
|
||||
socket = "/run/searx/uwsgi.sock";
|
||||
chmod-socket = "660";
|
||||
|
||||
# use /searx as url "mountpoint"
|
||||
mount = "/searx=searx.webapp:application";
|
||||
module = "";
|
||||
manage-script-name = true;
|
||||
# use /searx as url "mountpoint"
|
||||
mount = "/searx=searx.webapp:application";
|
||||
module = "";
|
||||
manage-script-name = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
# use nginx as reverse proxy
|
||||
services.nginx.enable = true;
|
||||
services.nginx.virtualHosts.localhost = {
|
||||
locations."/searx".extraConfig =
|
||||
''
|
||||
# use nginx as reverse proxy
|
||||
services.nginx.enable = true;
|
||||
services.nginx.virtualHosts.localhost = {
|
||||
locations."/searx".extraConfig = ''
|
||||
include ${pkgs.nginx}/conf/uwsgi_params;
|
||||
uwsgi_pass unix:/run/searx/uwsgi.sock;
|
||||
'';
|
||||
locations."/searx/static/".alias = "${config.services.searx.package}/share/static/";
|
||||
locations."/searx/static/".alias = "${config.services.searx.package}/share/static/";
|
||||
};
|
||||
|
||||
# allow nginx access to the searx socket
|
||||
users.users.nginx.extraGroups = [ "searx" ];
|
||||
|
||||
};
|
||||
|
||||
# allow nginx access to the searx socket
|
||||
users.users.nginx.extraGroups = [ "searx" ];
|
||||
testScript = ''
|
||||
base.start()
|
||||
|
||||
};
|
||||
with subtest("Settings have been merged"):
|
||||
base.wait_for_unit("searx-init")
|
||||
base.wait_for_file("/run/searx/settings.yml")
|
||||
output = base.succeed(
|
||||
"${pkgs.yq-go}/bin/yq eval"
|
||||
" '.engines[] | select(.name==\"startpage\") | .shortcut'"
|
||||
" /run/searx/settings.yml"
|
||||
).strip()
|
||||
assert output == "start", "Settings not merged"
|
||||
|
||||
testScript =
|
||||
''
|
||||
base.start()
|
||||
with subtest("Environment variables have been substituted"):
|
||||
base.succeed("grep -q somesecret /run/searx/settings.yml")
|
||||
base.succeed("grep -q sometoken /run/searx/settings.yml")
|
||||
base.copy_from_vm("/run/searx/settings.yml")
|
||||
|
||||
with subtest("Settings have been merged"):
|
||||
base.wait_for_unit("searx-init")
|
||||
base.wait_for_file("/run/searx/settings.yml")
|
||||
output = base.succeed(
|
||||
"${pkgs.yq-go}/bin/yq eval"
|
||||
" '.engines[] | select(.name==\"startpage\") | .shortcut'"
|
||||
" /run/searx/settings.yml"
|
||||
).strip()
|
||||
assert output == "start", "Settings not merged"
|
||||
with subtest("Basic setup is working"):
|
||||
base.wait_for_open_port(8080)
|
||||
base.wait_for_unit("searx")
|
||||
base.succeed(
|
||||
"${pkgs.curl}/bin/curl --fail http://localhost:8080"
|
||||
)
|
||||
base.shutdown()
|
||||
|
||||
with subtest("Environment variables have been substituted"):
|
||||
base.succeed("grep -q somesecret /run/searx/settings.yml")
|
||||
base.succeed("grep -q sometoken /run/searx/settings.yml")
|
||||
base.copy_from_vm("/run/searx/settings.yml")
|
||||
|
||||
with subtest("Basic setup is working"):
|
||||
base.wait_for_open_port(8080)
|
||||
base.wait_for_unit("searx")
|
||||
base.succeed(
|
||||
"${pkgs.curl}/bin/curl --fail http://localhost:8080"
|
||||
)
|
||||
base.shutdown()
|
||||
|
||||
with subtest("Nginx+uWSGI setup is working"):
|
||||
fancy.start()
|
||||
fancy.wait_for_open_port(80)
|
||||
fancy.wait_for_unit("uwsgi")
|
||||
fancy.succeed(
|
||||
"${pkgs.curl}/bin/curl --fail http://localhost/searx >&2"
|
||||
)
|
||||
fancy.succeed(
|
||||
"${pkgs.curl}/bin/curl --fail http://localhost/searx/static/themes/simple/js/leaflet.js >&2"
|
||||
)
|
||||
'';
|
||||
})
|
||||
with subtest("Nginx+uWSGI setup is working"):
|
||||
fancy.start()
|
||||
fancy.wait_for_open_port(80)
|
||||
fancy.wait_for_unit("uwsgi")
|
||||
fancy.succeed(
|
||||
"${pkgs.curl}/bin/curl --fail http://localhost/searx >&2"
|
||||
)
|
||||
fancy.succeed(
|
||||
"${pkgs.curl}/bin/curl --fail http://localhost/searx/static/themes/simple/js/leaflet.js >&2"
|
||||
)
|
||||
'';
|
||||
}
|
||||
|
||||
@ -1,84 +1,97 @@
|
||||
{ lib
|
||||
, python3
|
||||
, fetchFromGitHub
|
||||
{
|
||||
lib,
|
||||
python3,
|
||||
fetchFromGitHub,
|
||||
nixosTests
|
||||
}:
|
||||
|
||||
python3.pkgs.toPythonModule (python3.pkgs.buildPythonApplication rec {
|
||||
pname = "searxng";
|
||||
version = "0-unstable-2024-05-31";
|
||||
python3.pkgs.toPythonModule (
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "searxng";
|
||||
version = "0-unstable-2024-06-19";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "searxng";
|
||||
repo = "searxng";
|
||||
rev = "18fb701be225560b3fb1011cc533f785823f26a4";
|
||||
hash = "sha256-okE/Uxl7YqcM99kLJ4KAlMQi50x5m0bPfYp5bv62WEw=";
|
||||
};
|
||||
src = fetchFromGitHub {
|
||||
owner = "searxng";
|
||||
repo = "searxng";
|
||||
rev = "acf3f109b2a99a5e6f25f5f2975016a36673c6ef";
|
||||
hash = "sha256-NdFnB5JEaWo7gt+RwxKxkVtEL8uGLlc4z0ROHN+zoL4=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
sed -i 's/==.*$//' requirements.txt
|
||||
|
||||
# can't be fetchpatched as it is essentially empty and it complains about that
|
||||
# TODO: drop when updating to a version that includes https://github.com/searxng/searxng/pull/3563
|
||||
touch searx/answerers/random/__init__.py
|
||||
touch searx/answerers/statistics/__init__.py
|
||||
'';
|
||||
|
||||
preBuild =
|
||||
let
|
||||
versionString = lib.concatStringsSep "." (builtins.tail (lib.splitString "-" (lib.removePrefix "0-" version)));
|
||||
commitAbbrev = builtins.substring 0 8 src.rev;
|
||||
in
|
||||
''
|
||||
export SEARX_DEBUG="true";
|
||||
|
||||
cat > searx/version_frozen.py <<EOF
|
||||
VERSION_STRING="${versionString}+${commitAbbrev}"
|
||||
VERSION_TAG="${versionString}+${commitAbbrev}"
|
||||
DOCKER_TAG="${versionString}-${commitAbbrev}"
|
||||
GIT_URL="https://github.com/searxng/searxng"
|
||||
GIT_BRANCH="master"
|
||||
EOF
|
||||
postPatch = ''
|
||||
sed -i 's/==.*$//' requirements.txt
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
babel
|
||||
certifi
|
||||
python-dateutil
|
||||
fasttext-predict
|
||||
flask
|
||||
flask-babel
|
||||
brotli
|
||||
jinja2
|
||||
lxml
|
||||
pygments
|
||||
pytomlpp
|
||||
pyyaml
|
||||
redis
|
||||
uvloop
|
||||
setproctitle
|
||||
httpx
|
||||
httpx-socks
|
||||
markdown-it-py
|
||||
] ++ httpx.optional-dependencies.http2
|
||||
++ httpx-socks.optional-dependencies.asyncio;
|
||||
preBuild =
|
||||
let
|
||||
versionString = lib.concatStringsSep "." (
|
||||
builtins.tail (lib.splitString "-" (lib.removePrefix "0-" version))
|
||||
);
|
||||
commitAbbrev = builtins.substring 0 8 src.rev;
|
||||
in
|
||||
''
|
||||
export SEARX_DEBUG="true";
|
||||
|
||||
# tests try to connect to network
|
||||
doCheck = false;
|
||||
cat > searx/version_frozen.py <<EOF
|
||||
VERSION_STRING="${versionString}+${commitAbbrev}"
|
||||
VERSION_TAG="${versionString}+${commitAbbrev}"
|
||||
DOCKER_TAG="${versionString}-${commitAbbrev}"
|
||||
GIT_URL="https://github.com/searxng/searxng"
|
||||
GIT_BRANCH="master"
|
||||
EOF
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
# Create a symlink for easier access to static data
|
||||
mkdir -p $out/share
|
||||
ln -s ../${python3.sitePackages}/searx/static $out/share/
|
||||
dependencies =
|
||||
with python3.pkgs;
|
||||
[
|
||||
babel
|
||||
certifi
|
||||
python-dateutil
|
||||
fasttext-predict
|
||||
flask
|
||||
flask-babel
|
||||
brotli
|
||||
jinja2
|
||||
lxml
|
||||
pygments
|
||||
pytomlpp
|
||||
pyyaml
|
||||
redis
|
||||
uvloop
|
||||
setproctitle
|
||||
httpx
|
||||
httpx-socks
|
||||
markdown-it-py
|
||||
]
|
||||
++ httpx.optional-dependencies.http2
|
||||
++ httpx-socks.optional-dependencies.asyncio;
|
||||
|
||||
# copy config schema for the limiter
|
||||
cp searx/limiter.toml $out/${python3.sitePackages}/searx/limiter.toml
|
||||
'';
|
||||
# tests try to connect to network
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/searxng/searxng";
|
||||
description = "Fork of Searx, a privacy-respecting, hackable metasearch engine";
|
||||
license = licenses.agpl3Plus;
|
||||
mainProgram = "searxng-run";
|
||||
maintainers = with maintainers; [ SuperSandro2000 _999eagle ];
|
||||
};
|
||||
})
|
||||
postInstall = ''
|
||||
# Create a symlink for easier access to static data
|
||||
mkdir -p $out/share
|
||||
ln -s ../${python3.sitePackages}/searx/static $out/share/
|
||||
|
||||
# copy config schema for the limiter
|
||||
cp searx/limiter.toml $out/${python3.sitePackages}/searx/limiter.toml
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
tests = {
|
||||
searxng = nixosTests.searx;
|
||||
};
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/searxng/searxng";
|
||||
description = "Fork of Searx, a privacy-respecting, hackable metasearch engine";
|
||||
license = licenses.agpl3Plus;
|
||||
mainProgram = "searxng-run";
|
||||
maintainers = with maintainers; [
|
||||
SuperSandro2000
|
||||
_999eagle
|
||||
];
|
||||
};
|
||||
}
|
||||
)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user