forked from mirrors/nixpkgs
Merge pull request #109114 from illustris/searx
searx: 0.17.0 -> 0.18.0
This commit is contained in:
Michele Guerini Rocco
GitHub
commit
721a4ecfa6
|
|
@ -1,4 +1,4 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
{ options, config, lib, pkgs, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
|
|
@ -6,42 +6,14 @@ let
|
|||
runDir = "/run/searx";
|
||||
cfg = config.services.searx;
|
||||
|
||||
hasEngines =
|
||||
builtins.hasAttr "engines" cfg.settings &&
|
||||
cfg.settings.engines != { };
|
||||
|
||||
# Script to merge NixOS settings with
|
||||
# the default settings.yml bundled in searx.
|
||||
mergeConfig = ''
|
||||
generateConfig = ''
|
||||
cd ${runDir}
|
||||
# find the default settings.yml
|
||||
default=$(find '${cfg.package}/' -name settings.yml)
|
||||
|
||||
# write NixOS settings as JSON
|
||||
cat <<'EOF' > settings.json
|
||||
cat <<'EOF' > settings.yml
|
||||
${builtins.toJSON cfg.settings}
|
||||
EOF
|
||||
|
||||
${optionalString hasEngines ''
|
||||
# extract and convert the default engines array to an object
|
||||
${pkgs.yq-go}/bin/yq r "$default" engines -j | \
|
||||
${pkgs.jq}/bin/jq 'reduce .[] as $e ({}; .[$e.name] = $e)' \
|
||||
> engines.json
|
||||
|
||||
# merge and update the NixOS engines with the newly created object
|
||||
cp settings.json temp.json
|
||||
${pkgs.jq}/bin/jq -s '. as [$s, $e] | $s | .engines |=
|
||||
($e * . | to_entries | map (.value))' \
|
||||
temp.json engines.json > settings.json
|
||||
|
||||
# clean up temporary files
|
||||
rm {engines,temp}.json
|
||||
''}
|
||||
|
||||
# merge the default and NixOS settings
|
||||
${pkgs.yq-go}/bin/yq m -P settings.json "$default" > settings.yml
|
||||
rm settings.json
|
||||
|
||||
# substitute environment variables
|
||||
env -0 | while IFS='=' read -r -d ''' n v; do
|
||||
sed "s#@$n@#$v#g" -i settings.yml
|
||||
|
|
@ -51,6 +23,12 @@ let
|
|||
chmod 400 settings.yml
|
||||
'';
|
||||
|
||||
settingType = with types; (oneOf
|
||||
[ bool int float str
|
||||
(listOf settingType)
|
||||
(attrsOf settingType)
|
||||
]) // { description = "JSON value"; };
|
||||
|
||||
in
|
||||
|
||||
{
|
||||
|
|
@ -86,15 +64,16 @@ in
|
|||
};
|
||||
|
||||
settings = mkOption {
|
||||
type = types.attrs;
|
||||
type = types.attrsOf settingType;
|
||||
default = { };
|
||||
example = literalExample ''
|
||||
{ server.port = 8080;
|
||||
server.bind_address = "0.0.0.0";
|
||||
server.secret_key = "@SEARX_SECRET_KEY@";
|
||||
|
||||
engines.wolframalpha =
|
||||
{ shortcut = "wa";
|
||||
engines = lib.singleton
|
||||
{ name = "wolframalpha";
|
||||
shortcut = "wa";
|
||||
api_key = "@WOLFRAM_API_KEY@";
|
||||
engine = "wolframalpha_api";
|
||||
};
|
||||
|
|
@ -155,9 +134,9 @@ in
|
|||
};
|
||||
|
||||
uwsgiConfig = mkOption {
|
||||
type = types.attrs;
|
||||
type = options.services.uwsgi.instance.type;
|
||||
default = { http = ":8080"; };
|
||||
example = lib.literalExample ''
|
||||
example = literalExample ''
|
||||
{
|
||||
disable-logging = true;
|
||||
http = ":8080"; # serve via HTTP...
|
||||
|
|
@ -199,7 +178,7 @@ in
|
|||
RuntimeDirectoryMode = "750";
|
||||
} // optionalAttrs (cfg.environmentFile != null)
|
||||
{ EnvironmentFile = builtins.toPath cfg.environmentFile; };
|
||||
script = mergeConfig;
|
||||
script = generateConfig;
|
||||
};
|
||||
|
||||
systemd.services.searx = mkIf (!cfg.runInUwsgi) {
|
||||
|
|
@ -221,6 +200,11 @@ in
|
|||
after = [ "searx-init.service" ];
|
||||
};
|
||||
|
||||
services.searx.settings = {
|
||||
# merge NixOS settings with defaults settings.yml
|
||||
use_default_settings = mkDefault true;
|
||||
};
|
||||
|
||||
services.uwsgi = mkIf (cfg.runInUwsgi) {
|
||||
enable = true;
|
||||
plugins = [ "python3" ];
|
||||
|
|
@ -241,6 +225,6 @@ in
|
|||
|
||||
};
|
||||
|
||||
meta.maintainers = with lib.maintainers; [ rnhmjoj ];
|
||||
meta.maintainers = with maintainers; [ rnhmjoj ];
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -22,13 +22,15 @@ import ./make-test-python.nix ({ pkgs, ...} :
|
|||
bind_address = "0.0.0.0";
|
||||
secret_key = "@SEARX_SECRET_KEY@";
|
||||
};
|
||||
settings.engines = {
|
||||
wolframalpha =
|
||||
{ api_key = "@WOLFRAM_API_KEY@";
|
||||
engine = "wolframalpha_api";
|
||||
};
|
||||
startpage.shortcut = "start";
|
||||
};
|
||||
settings.engines = [
|
||||
{ name = "wolframalpha";
|
||||
api_key = "@WOLFRAM_API_KEY@";
|
||||
engine = "wolframalpha_api";
|
||||
}
|
||||
{ name = "startpage";
|
||||
shortcut = "start";
|
||||
}
|
||||
];
|
||||
};
|
||||
|
||||
};
|
||||
|
|
@ -39,6 +41,9 @@ import ./make-test-python.nix ({ pkgs, ...} :
|
|||
|
||||
services.searx = {
|
||||
enable = true;
|
||||
# searx refuses to run if unchanged
|
||||
settings.server.secret_key = "somesecret";
|
||||
|
||||
runInUwsgi = true;
|
||||
uwsgiConfig = {
|
||||
# serve using the uwsgi protocol
|
||||
|
|
@ -106,4 +111,3 @@ import ./make-test-python.nix ({ pkgs, ...} :
|
|||
)
|
||||
'';
|
||||
})
|
||||
|
||||
|
|
|
|||
|
|
@ -4,18 +4,24 @@ with python3Packages;
|
|||
|
||||
toPythonModule (buildPythonApplication rec {
|
||||
pname = "searx";
|
||||
version = "0.17.0";
|
||||
version = "0.18.0";
|
||||
|
||||
# Can not use PyPI because certain test files are missing.
|
||||
src = fetchFromGitHub {
|
||||
owner = "asciimoo";
|
||||
owner = "searx";
|
||||
repo = "searx";
|
||||
rev = "v${version}";
|
||||
sha256 = "0pznz3wsaikl8khmzqvj05kzh5y07hjw8gqhy6x0lz1b00cn5af4";
|
||||
sha256 = "0idxspvckvsd02v42h4z4wqrfkn1l8n59i91f7pc837cxya8p6hn";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
sed -i 's/==.*$//' requirements.txt
|
||||
# skip failing test
|
||||
sed -i '/test_json_serial(/,+3d' tests/unit/test_standalone_searx.py
|
||||
'';
|
||||
|
||||
preBuild = ''
|
||||
export SEARX_DEBUG="true";
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -30,10 +36,6 @@ toPythonModule (buildPythonApplication rec {
|
|||
unittest2 zope_testrunner selenium
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
rm tests/test_robot.py # A variable that is imported is commented out
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
# Create a symlink for easier access to static data
|
||||
mkdir -p $out/share
|
||||
|
|
@ -43,7 +45,7 @@ toPythonModule (buildPythonApplication rec {
|
|||
passthru.tests = { inherit (nixosTests) searx; };
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/asciimoo/searx";
|
||||
homepage = "https://github.com/searx/searx";
|
||||
description = "A privacy-respecting, hackable metasearch engine";
|
||||
license = licenses.agpl3Plus;
|
||||
maintainers = with maintainers; [ matejc fpletz globin danielfullmer ];
|
||||
|
|
|
|||
Loading…
Reference in a new issue