From 8a6251839a8a4f913ae1d9a17a56170980c32ac8 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Wed, 28 Feb 2024 21:17:28 -0300 Subject: [PATCH 1/3] duden: migrate to python-modules Because it is a "dual package": a Python app and lib. --- .../misc => development/python-modules}/duden/default.nix | 0 pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/python-packages.nix | 2 ++ 3 files changed, 3 insertions(+), 1 deletion(-) rename pkgs/{applications/misc => development/python-modules}/duden/default.nix (100%) diff --git a/pkgs/applications/misc/duden/default.nix b/pkgs/development/python-modules/duden/default.nix similarity index 100% rename from pkgs/applications/misc/duden/default.nix rename to pkgs/development/python-modules/duden/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e4af9c196390..0fe2f15909df 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -41713,7 +41713,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 d2fceb9e64e6..3df2e45be2cc 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3500,6 +3500,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 { }; From b590908c9e7a7ad4149d85607438acd9061e3387 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Wed, 28 Feb 2024 20:54:43 -0300 Subject: [PATCH 2/3] duden: refactor - get rid of rec by using recursive let - do not use python3.pkgs (oh that splicing dark magic) - get rid of nested with - set meta.mainProgram - adopted by AndersonTorres --- .../python-modules/duden/default.nix | 84 +++++++++++-------- 1 file changed, 50 insertions(+), 34 deletions(-) diff --git a/pkgs/development/python-modules/duden/default.nix b/pkgs/development/python-modules/duden/default.nix index 0d310e8c23dc..a28ae2e1291a 100644 --- a/pkgs/development/python-modules/duden/default.nix +++ b/pkgs/development/python-modules/duden/default.nix @@ -1,40 +1,56 @@ { lib -, python3 +, beautifulsoup4 +, buildPythonPackage +, crayons , fetchFromGitHub +, poetry-core +, pyxdg +, pyyaml +, requests +, setuptools }: -python3.pkgs.buildPythonPackage rec { - pname = "duden"; - version = "0.18.0"; - format = "pyproject"; +let + finalAttrs = { + pname = "duden"; + version = "0.18.0"; + pyproject = true; - src = fetchFromGitHub { - owner = "radomirbosak"; - repo = "duden"; - rev = version; - hash = "sha256-ZrarN09Znw4m6YiZxD7q7dTJ49WjmHDobLnOt8JCwvc="; + src = fetchFromGitHub { + owner = "radomirbosak"; + repo = "duden"; + rev = finalAttrs.version; + hash = "sha256-ZrarN09Znw4m6YiZxD7q7dTJ49WjmHDobLnOt8JCwvc="; + }; + + 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 ]; + }; }; - - 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; [ ]; - }; -} +in +buildPythonPackage finalAttrs From 36da5a3900fb792105b5b532c124661b23432134 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Wed, 28 Feb 2024 21:33:13 -0300 Subject: [PATCH 3/3] duden: 0.18.0 -> 0.19.1 Co-authored-by: linuxissuper Co-authored-by: R. RyanTM --- pkgs/development/python-modules/duden/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/duden/default.nix b/pkgs/development/python-modules/duden/default.nix index a28ae2e1291a..6381da7271ee 100644 --- a/pkgs/development/python-modules/duden/default.nix +++ b/pkgs/development/python-modules/duden/default.nix @@ -13,14 +13,14 @@ let finalAttrs = { pname = "duden"; - version = "0.18.0"; + version = "0.19.1"; pyproject = true; src = fetchFromGitHub { owner = "radomirbosak"; repo = "duden"; rev = finalAttrs.version; - hash = "sha256-ZrarN09Znw4m6YiZxD7q7dTJ49WjmHDobLnOt8JCwvc="; + hash = "sha256-c6IItrjFVbsdYg3sDrExcxv7aRcKhd/M5hiZD+wBZ2Y="; }; nativeBuildInputs = [ @@ -49,7 +49,7 @@ let ''; license = with lib.licenses; [ mit ]; mainProgram = "duden"; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ AndersonTorres linuxissuper ]; }; }; in