From cd9baa85553dc2f1bcbff4253286343e169e2475 Mon Sep 17 00:00:00 2001 From: Sophie Tauchert Date: Fri, 29 Sep 2023 11:20:12 +0200 Subject: [PATCH 1/3] searxng: move to pkgs/by-name --- .../searxng/default.nix => by-name/se/searxng/package.nix} | 4 ++-- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) rename pkgs/{servers/web-apps/searxng/default.nix => by-name/se/searxng/package.nix} (96%) diff --git a/pkgs/servers/web-apps/searxng/default.nix b/pkgs/by-name/se/searxng/package.nix similarity index 96% rename from pkgs/servers/web-apps/searxng/default.nix rename to pkgs/by-name/se/searxng/package.nix index 37fd2317bb7c..fbfa8aaa6387 100644 --- a/pkgs/servers/web-apps/searxng/default.nix +++ b/pkgs/by-name/se/searxng/package.nix @@ -3,7 +3,7 @@ , fetchFromGitHub }: -python3.pkgs.buildPythonApplication rec { +python3.pkgs.toPythonModule (python3.pkgs.buildPythonApplication rec { pname = "searxng"; version = "unstable-2023-07-19"; @@ -75,4 +75,4 @@ python3.pkgs.buildPythonApplication rec { license = licenses.agpl3Plus; maintainers = with maintainers; [ SuperSandro2000 ]; }; -} +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 492bee921f13..3d1e0d25b6ef 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27576,8 +27576,6 @@ with pkgs; searx = callPackage ../servers/web-apps/searx { }; - searxng = python3Packages.toPythonModule (callPackage ../servers/web-apps/searxng { }); - selfoss = callPackage ../servers/web-apps/selfoss { }; shaarli = callPackage ../servers/web-apps/shaarli { }; From e024929b15f1c90407c292283d0af79243cbaa74 Mon Sep 17 00:00:00 2001 From: Sophie Tauchert Date: Fri, 29 Sep 2023 11:29:25 +0200 Subject: [PATCH 2/3] searxng: unstable-2023-07-19 -> unstable-2023-10-01 --- 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 fbfa8aaa6387..fb1e8b22c011 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-07-19"; + version = "unstable-2023-10-01"; src = fetchFromGitHub { owner = pname; repo = pname; - rev = "a446dea1bb492eac417de9a900fae7cdf94aeec0"; - sha256 = "sha256-iZDaKCkDlp3O3IixWdXVykNRIxas+irG0dWAOU4wycI="; + rev = "d56b31d67473e0970bc457469b0cbec2e35f8b10"; + hash = "sha256-/lMjL2dl7UVYRjafFKmV3XsIH6QehUWCozCuBuxFgpQ="; }; postPatch = '' From 6cb37d6145880fb58b82af4f6558d77d66dfcf8a Mon Sep 17 00:00:00 2001 From: Sophie Tauchert Date: Tue, 3 Oct 2023 20:25:18 +0200 Subject: [PATCH 3/3] searxng: add 999eagle to maintainers --- pkgs/by-name/se/searxng/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/se/searxng/package.nix b/pkgs/by-name/se/searxng/package.nix index fb1e8b22c011..db5c9f6b3419 100644 --- a/pkgs/by-name/se/searxng/package.nix +++ b/pkgs/by-name/se/searxng/package.nix @@ -73,6 +73,6 @@ 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; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = with maintainers; [ SuperSandro2000 _999eagle ]; }; })