From c217f48c358db05bd0ad7893e8e3ebabe4784cbe Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 1 Aug 2017 01:11:36 +0200 Subject: [PATCH] searx: 0.11.0 -> 0.12.0 --- nixos/modules/services/networking/searx.nix | 4 +-- pkgs/servers/web-apps/searx/default.nix | 34 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ pkgs/top-level/python-packages.nix | 36 --------------------- 4 files changed, 38 insertions(+), 38 deletions(-) create mode 100644 pkgs/servers/web-apps/searx/default.nix diff --git a/nixos/modules/services/networking/searx.nix b/nixos/modules/services/networking/searx.nix index e0eef9ed96f..c7a128ae212 100644 --- a/nixos/modules/services/networking/searx.nix +++ b/nixos/modules/services/networking/searx.nix @@ -33,8 +33,8 @@ in package = mkOption { type = types.package; - default = pkgs.pythonPackages.searx; - defaultText = "pkgs.pythonPackages.searx"; + default = pkgs.searx; + defaultText = "pkgs.searx"; description = "searx package to use."; }; diff --git a/pkgs/servers/web-apps/searx/default.nix b/pkgs/servers/web-apps/searx/default.nix new file mode 100644 index 00000000000..551f3a015a1 --- /dev/null +++ b/pkgs/servers/web-apps/searx/default.nix @@ -0,0 +1,34 @@ +{ stdenv, pythonPackages, fetchFromGitHub }: + +pythonPackages.buildPythonApplication rec { + name = "searx-${version}"; + version = "0.12.0"; + + src = fetchFromGitHub { + owner = "asciimoo"; + repo = "searx"; + rev = "v${version}"; + sha256 = "196lk8dpv8fsjgmwlqik6j6rabvfid41fir6lzqy03hv7ydcw1k0"; + }; + + postPatch = '' + substituteInPlace requirements.txt \ + --replace 'certifi==2017.1.23' 'certifi' \ + --replace 'lxml==3.7.3' 'lxml' \ + --replace 'pyopenssl==16.2.0' 'pyopenssl' \ + --replace 'pygments==2.1.3' 'pygments>=2.1,<3.0' + ''; + + propagatedBuildInputs = with pythonPackages; [ + pyyaml lxml grequests flaskbabel flask requests + gevent speaklater Babel pytz dateutil pygments + pyasn1 pyasn1-modules ndg-httpsclient certifi pysocks + ]; + + meta = with stdenv.lib; { + homepage = https://github.com/asciimoo/searx; + description = "A privacy-respecting, hackable metasearch engine"; + license = licenses.agpl3Plus; + maintainers = with maintainers; [ matejc fpletz profpatsch ]; + }; + } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 97cd763bb22..613de47709a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11580,6 +11580,8 @@ with pkgs; tt-rss = callPackage ../servers/tt-rss { }; + searx = callPackages ../servers/web-apps/searx { }; + selfoss = callPackage ../servers/web-apps/selfoss { }; shaarli = callPackage ../servers/web-apps/shaarli { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4ae21516f7d..3ae2791beca 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -26379,42 +26379,6 @@ EOF }; }; - searx = buildPythonPackage rec { - name = "searx-${version}"; - version = "0.11.0"; - - src = pkgs.fetchFromGitHub { - owner = "asciimoo"; - repo = "searx"; - rev = "v${version}"; - sha256 = "1m6q7yd45lfk19yp30x1jmisff6npa1y348wqc9ixa3ywvb28ky8"; - }; - - postPatch = '' - substituteInPlace requirements.txt \ - --replace 'certifi==2016.9.26' 'certifi' \ - --replace 'pyyaml==3.11' 'pyyaml' \ - --replace 'lxml==3.7.1' 'lxml' \ - --replace 'pyopenssl==16.2.0' 'pyopenssl' \ - --replace 'requests[socks]==2.12.4' 'requests[socks]' \ - --replace 'pygments==2.1.3' 'pygments>=2.1,<3.0' \ - --replace 'python-dateutil==2.5.3' 'python-dateutil>=2.5,<3.0' - ''; - - propagatedBuildInputs = with self; [ - pyyaml lxml grequests flaskbabel flask requests - gevent speaklater Babel pytz dateutil pygments - pyasn1 pyasn1-modules ndg-httpsclient certifi pysocks - ]; - - meta = { - homepage = https://github.com/asciimoo/searx; - description = "A privacy-respecting, hackable metasearch engine"; - license = licenses.agpl3Plus; - maintainers = with maintainers; [ matejc fpletz profpatsch ]; - }; - }; - rpdb = buildPythonPackage rec { name = "rpdb-0.1.5";