diff --git a/pkgs/applications/misc/duden/default.nix b/pkgs/applications/misc/duden/default.nix deleted file mode 100644 index 0d310e8c23dc..000000000000 --- a/pkgs/applications/misc/duden/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ lib -, python3 -, fetchFromGitHub -}: - -python3.pkgs.buildPythonPackage rec { - pname = "duden"; - version = "0.18.0"; - format = "pyproject"; - - src = fetchFromGitHub { - owner = "radomirbosak"; - repo = "duden"; - rev = version; - hash = "sha256-ZrarN09Znw4m6YiZxD7q7dTJ49WjmHDobLnOt8JCwvc="; - }; - - nativeBuildInputs = [ - python3.pkgs.poetry-core - ]; - - propagatedBuildInputs = with python3.pkgs; [ - beautifulsoup4 - crayons - pyxdg - pyyaml - requests - setuptools - ]; - - pythonImportsCheck = [ "duden" ]; - - meta = with lib; { - description = "CLI for http://duden.de dictionary written in Python"; - homepage = "https://github.com/radomirbosak/duden"; - changelog = "https://github.com/radomirbosak/duden/blob/${src.rev}/CHANGELOG.md"; - license = licenses.mit; - maintainers = with maintainers; [ ]; - }; -} diff --git a/pkgs/development/python-modules/duden/default.nix b/pkgs/development/python-modules/duden/default.nix new file mode 100644 index 000000000000..6381da7271ee --- /dev/null +++ b/pkgs/development/python-modules/duden/default.nix @@ -0,0 +1,56 @@ +{ lib +, beautifulsoup4 +, buildPythonPackage +, crayons +, fetchFromGitHub +, poetry-core +, pyxdg +, pyyaml +, requests +, setuptools +}: + +let + finalAttrs = { + pname = "duden"; + version = "0.19.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "radomirbosak"; + repo = "duden"; + rev = finalAttrs.version; + hash = "sha256-c6IItrjFVbsdYg3sDrExcxv7aRcKhd/M5hiZD+wBZ2Y="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + beautifulsoup4 + crayons + pyxdg + pyyaml + requests + setuptools + ]; + + pythonImportsCheck = [ "duden" ]; + + meta = { + homepage = "https://github.com/radomirbosak/duden"; + changelog = "https://github.com/radomirbosak/duden/blob/${finalAttrs.src.rev}/CHANGELOG.md"; + description = "CLI for https://duden.de dictionary written in Python"; + longDescription = '' + duden is a CLI-based program and python module, which can provide + various information about given german word. The provided data are + parsed from german dictionary duden.de. + ''; + license = with lib.licenses; [ mit ]; + mainProgram = "duden"; + maintainers = with lib.maintainers; [ AndersonTorres linuxissuper ]; + }; + }; +in +buildPythonPackage finalAttrs diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 72af0d51f7b3..ef631fdefdf9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -41710,7 +41710,7 @@ with pkgs; udict = callPackage ../applications/misc/udict { }; - duden = callPackage ../applications/misc/duden { }; + duden = python3Packages.toPythonApplication python3Packages.duden; zf = callPackage ../tools/misc/zf { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7bc514fc7e58..86faee8e0e70 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3502,6 +3502,8 @@ self: super: with self; { duct-py = callPackage ../development/python-modules/duct-py { }; + duden = callPackage ../development/python-modules/duden { }; + duecredit = callPackage ../development/python-modules/duecredit { }; duet = callPackage ../development/python-modules/duet { };