From 913b78f8790b4710ccaabc124a5272d9d32dae02 Mon Sep 17 00:00:00 2001 From: Sophie Tauchert Date: Thu, 20 Jul 2023 11:10:56 +0200 Subject: [PATCH 1/2] searxng: unstable-2023-06-26 -> unstable-2023-07-19 --- pkgs/servers/web-apps/searxng/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/web-apps/searxng/default.nix b/pkgs/servers/web-apps/searxng/default.nix index 8cc99e5cf4cc..5b6fa985fd0d 100644 --- a/pkgs/servers/web-apps/searxng/default.nix +++ b/pkgs/servers/web-apps/searxng/default.nix @@ -5,13 +5,13 @@ python3.pkgs.buildPythonApplication rec { pname = "searxng"; - version = "unstable-2023-06-26"; + version = "unstable-2023-07-19"; src = fetchFromGitHub { owner = pname; repo = pname; - rev = "da7c30291dcf53cc5b3d98f9aada5615cd1593a9"; - sha256 = "sha256-kbNw/YgcBZNkmn2nmsnEnc9Y8MJg3zGFdW1x9GIo+dM="; + rev = "a446dea1bb492eac417de9a900fae7cdf94aeec0"; + sha256 = "sha256-iZDaKCkDlp3O3IixWdXVykNRIxas+irG0dWAOU4wycI="; }; postPatch = '' From c6b3caa1fdd87d7528daa8a26a0894ded828ddc4 Mon Sep 17 00:00:00 2001 From: Sophie Tauchert Date: Thu, 20 Jul 2023 12:41:27 +0200 Subject: [PATCH 2/2] searxng: freeze version --- pkgs/servers/web-apps/searxng/default.nix | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/web-apps/searxng/default.nix b/pkgs/servers/web-apps/searxng/default.nix index 5b6fa985fd0d..37fd2317bb7c 100644 --- a/pkgs/servers/web-apps/searxng/default.nix +++ b/pkgs/servers/web-apps/searxng/default.nix @@ -18,9 +18,22 @@ python3.pkgs.buildPythonApplication rec { sed -i 's/==.*$//' requirements.txt ''; - preBuild = '' - export SEARX_DEBUG="true"; - ''; + preBuild = + let + versionString = lib.concatStringsSep "." (builtins.tail (lib.splitString "-" version)); + commitAbbrev = builtins.substring 0 8 src.rev; + in + '' + export SEARX_DEBUG="true"; + + cat > searx/version_frozen.py <