From 13dd600bf6a4a17ba2f1c4d9cebefb3755444417 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 1 Dec 2023 02:49:24 +0000 Subject: [PATCH 1/2] python310Packages.duckduckgo-search: 3.9.4 -> 3.9.9 --- pkgs/development/python-modules/duckduckgo-search/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/duckduckgo-search/default.nix b/pkgs/development/python-modules/duckduckgo-search/default.nix index 2e084fe774fd..722852e8bb98 100644 --- a/pkgs/development/python-modules/duckduckgo-search/default.nix +++ b/pkgs/development/python-modules/duckduckgo-search/default.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "duckduckgo-search"; - version = "3.9.4"; + version = "3.9.9"; src = fetchFromGitHub { owner = "deedy5"; repo = "duckduckgo_search"; rev = "refs/tags/v${version}"; - hash = "sha256-R96ezs0INIZAXTcD1eWXuj4MSJvCbtbgzgC3ls7wYyI="; + hash = "sha256-swuMCobYF5u41O1Qp5Gx/n8BIgSEnhRVZ5Owk3IPbeI="; }; format = "pyproject"; From f157aba7fa5b9e1f0518e49cd604cf7e7d546a54 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 1 Dec 2023 11:11:35 +0100 Subject: [PATCH 2/2] python310Packages.duckduckgo-search: refactor --- .../duckduckgo-search/default.nix | 31 ++++++++++++------- 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/duckduckgo-search/default.nix b/pkgs/development/python-modules/duckduckgo-search/default.nix index 722852e8bb98..76447627c4c5 100644 --- a/pkgs/development/python-modules/duckduckgo-search/default.nix +++ b/pkgs/development/python-modules/duckduckgo-search/default.nix @@ -1,19 +1,23 @@ -{ buildPythonPackage -, fetchFromGitHub -, lib -, setuptools +{ lib , aiofiles +, buildPythonPackage , click +, fetchFromGitHub , h2 , httpx , lxml +, pythonOlder , requests +, setuptools , socksio }: buildPythonPackage rec { pname = "duckduckgo-search"; version = "3.9.9"; + pyproject = true; + + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "deedy5"; @@ -22,9 +26,9 @@ buildPythonPackage rec { hash = "sha256-swuMCobYF5u41O1Qp5Gx/n8BIgSEnhRVZ5Owk3IPbeI="; }; - format = "pyproject"; - - nativeBuildInputs = [ setuptools ]; + nativeBuildInputs = [ + setuptools + ]; propagatedBuildInputs = [ aiofiles @@ -38,12 +42,15 @@ buildPythonPackage rec { ++ httpx.optional-dependencies.http2 ++ httpx.optional-dependencies.socks; - pythonImportsCheck = [ "duckduckgo_search" ]; + pythonImportsCheck = [ + "duckduckgo_search" + ]; - meta = { - description = "A python CLI and library for searching for words, documents, images, videos, news, maps and text translation using the DuckDuckGo.com search engine"; + meta = with lib; { + description = "Python CLI and library for searching for words, documents, images, videos, news, maps and text translation using the DuckDuckGo.com search engine"; homepage = "https://github.com/deedy5/duckduckgo_search"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ ]; + changelog = "https://github.com/deedy5/duckduckgo_search/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ ]; }; }