From 4ff88c15593bc2ea5d4058627ce216fd435d66a5 Mon Sep 17 00:00:00 2001 From: Sandro Date: Mon, 26 Feb 2024 12:27:51 +0100 Subject: [PATCH 1/6] searxng: unstable-2023-10-31 -> 0-unstable-2024-02-24 (#290962) --- pkgs/by-name/se/searxng/package.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/se/searxng/package.nix b/pkgs/by-name/se/searxng/package.nix index 24fd8be884784..c0d6cd63036d7 100644 --- a/pkgs/by-name/se/searxng/package.nix +++ b/pkgs/by-name/se/searxng/package.nix @@ -5,13 +5,13 @@ python3.pkgs.toPythonModule (python3.pkgs.buildPythonApplication rec { pname = "searxng"; - version = "unstable-2023-10-31"; + version = "0-unstable-2024-02-24"; src = fetchFromGitHub { - owner = pname; - repo = pname; - rev = "b05a15540e1dc2dfb8e4e25aa537b2a68e713844"; - hash = "sha256-x0PyS+A4KjbBnTpca17Wx3BQjtOHvVuWpusPPc1ULnU="; + owner = "searxng"; + repo = "searxng"; + rev = "d72fa99bd0a4d702a55188b07919ce5a764b1d6c"; + hash = "sha256-1A7dyWrF63fSSvWP+2HrCS6H8o/4CUlqiP0KANVZHUA="; }; postPatch = '' @@ -20,7 +20,7 @@ python3.pkgs.toPythonModule (python3.pkgs.buildPythonApplication rec { preBuild = let - versionString = lib.concatStringsSep "." (builtins.tail (lib.splitString "-" version)); + versionString = lib.concatStringsSep "." (builtins.tail (lib.splitString "-" (lib.removePrefix "0-" version))); commitAbbrev = builtins.substring 0 8 src.rev; in '' @@ -66,7 +66,7 @@ python3.pkgs.toPythonModule (python3.pkgs.buildPythonApplication rec { ln -s ../${python3.sitePackages}/searx/static $out/share/ # copy config schema for the limiter - cp searx/botdetection/limiter.toml $out/${python3.sitePackages}/searx/botdetection/limiter.toml + cp searx/limiter.toml $out/${python3.sitePackages}/searx/limiter.toml ''; meta = with lib; { From 2e8242a6dc345cebb453948270b4d7f91c5b0010 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 28 Feb 2024 15:33:07 -0800 Subject: [PATCH 2/6] searxng: set meta.mainProgram --- pkgs/by-name/se/searxng/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/se/searxng/package.nix b/pkgs/by-name/se/searxng/package.nix index c0d6cd63036d7..6f541d8a3b38f 100644 --- a/pkgs/by-name/se/searxng/package.nix +++ b/pkgs/by-name/se/searxng/package.nix @@ -73,6 +73,7 @@ python3.pkgs.toPythonModule (python3.pkgs.buildPythonApplication rec { homepage = "https://github.com/searxng/searxng"; description = "A fork of Searx, a privacy-respecting, hackable metasearch engine"; license = licenses.agpl3Plus; + mainProgram = "searxng-run"; maintainers = with maintainers; [ SuperSandro2000 _999eagle ]; }; }) From 7ecbb06b006ca50c2ee43556e111283ad0ffb1f7 Mon Sep 17 00:00:00 2001 From: amalgame21 Date: Thu, 7 Mar 2024 23:10:59 +0800 Subject: [PATCH 3/6] searxng: 0-unstable-2024-02-24 -> 0-unstable-2024-03-08 --- pkgs/by-name/se/searxng/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/se/searxng/package.nix b/pkgs/by-name/se/searxng/package.nix index 6f541d8a3b38f..2fdf2e8b92843 100644 --- a/pkgs/by-name/se/searxng/package.nix +++ b/pkgs/by-name/se/searxng/package.nix @@ -5,13 +5,13 @@ python3.pkgs.toPythonModule (python3.pkgs.buildPythonApplication rec { pname = "searxng"; - version = "0-unstable-2024-02-24"; + version = "0-unstable-2024-03-08"; src = fetchFromGitHub { owner = "searxng"; repo = "searxng"; - rev = "d72fa99bd0a4d702a55188b07919ce5a764b1d6c"; - hash = "sha256-1A7dyWrF63fSSvWP+2HrCS6H8o/4CUlqiP0KANVZHUA="; + rev = "9c08a0cdddae7ceafbe5e00ce94cf7f1d36c97e0"; + hash = "sha256-0qlOpJqpOmseIeIafd0NLd2lF5whu18QxmwOua8dKzg="; }; postPatch = '' From d240a296145050684f1d53d513e7d7523d84866c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 9 Feb 2024 04:55:47 +0000 Subject: [PATCH 4/6] uwsgi: 2.0.23 -> 2.0.24 --- pkgs/servers/uwsgi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/uwsgi/default.nix b/pkgs/servers/uwsgi/default.nix index beeca756d8678..b75b1633df1cf 100644 --- a/pkgs/servers/uwsgi/default.nix +++ b/pkgs/servers/uwsgi/default.nix @@ -71,13 +71,13 @@ in stdenv.mkDerivation (finalAttrs: { pname = "uwsgi"; - version = "2.0.23"; + version = "2.0.24"; src = fetchFromGitHub { owner = "unbit"; repo = "uwsgi"; rev = finalAttrs.version; - hash = "sha256-gyYsgPF6eGa3D7bjmhhVER+uM0yPLfZiwSUzZ2mGcHg="; + hash = "sha256-KVzIp2rKCpF6aXhhu+6nw7q8Pnx/0+HD23mmYmVFPSA="; }; patches = [ From 4ade5594746d3c034b6b33d24d4b5fd9d3815514 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 28 Feb 2024 15:39:23 -0800 Subject: [PATCH 5/6] nixos/tests/searx: use configured package for static content Also use the simple theme because upstream dropped the oscar one: https://github.com/searxng/searxng/discussions/1167 --- nixos/tests/searx.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/tests/searx.nix b/nixos/tests/searx.nix index 2f808cb65266e..02a88f690db78 100644 --- a/nixos/tests/searx.nix +++ b/nixos/tests/searx.nix @@ -36,7 +36,7 @@ import ./make-test-python.nix ({ pkgs, ...} : }; # fancy setup: run in uWSGI and use nginx as proxy - nodes.fancy = { ... }: { + nodes.fancy = { config, ... }: { imports = [ ../modules/profiles/minimal.nix ]; services.searx = { @@ -65,7 +65,7 @@ import ./make-test-python.nix ({ pkgs, ...} : include ${pkgs.nginx}/conf/uwsgi_params; uwsgi_pass unix:/run/searx/uwsgi.sock; ''; - locations."/searx/static/".alias = "${pkgs.searx}/share/static/"; + locations."/searx/static/".alias = "${config.services.searx.package}/share/static/"; }; # allow nginx access to the searx socket @@ -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/themes/oscar/js/bootstrap.min.js >&2" + "${pkgs.curl}/bin/curl --fail http://localhost/searx/static/themes/simple/js/leaflet.js >&2" ) ''; }) From 1c9851168ea5ffaeb5202979bbf4707806ff399e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 28 Feb 2024 15:34:16 -0800 Subject: [PATCH 6/6] nixos/searx: use lib.getExe --- nixos/modules/services/networking/searx.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/searx.nix b/nixos/modules/services/networking/searx.nix index 8054f01d705f6..a9eef61213f45 100644 --- a/nixos/modules/services/networking/searx.nix +++ b/nixos/modules/services/networking/searx.nix @@ -218,7 +218,7 @@ in serviceConfig = { User = "searx"; Group = "searx"; - ExecStart = "${cfg.package}/bin/searx-run"; + ExecStart = lib.getExe cfg.package; } // optionalAttrs (cfg.environmentFile != null) { EnvironmentFile = builtins.toPath cfg.environmentFile; }; environment = {