From de8cf20eb1662d6167973154e6aba3b22e94c4a9 Mon Sep 17 00:00:00 2001 From: Luka Leer Date: Sun, 22 Sep 2024 22:06:02 +0200 Subject: [PATCH 1/4] maintainers: add mahtaran Signed-off-by: Luka Leer --- maintainers/maintainer-list.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 33c7084d01610..ae1cc1ecf4146 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -12942,6 +12942,17 @@ githubId = 24735185; name = "Mahmoud Ayman"; }; + mahtaran = { + email = "luka.leer@gmail.com"; + github = "mahtaran"; + githubId = 22727323; + name = "Luka Leer"; + keys = [ + { + fingerprint = "C7FF B72E 0527 423A D470 E132 AA82 C4EB CB16 82E0"; + } + ]; + }; majesticmullet = { email = "hoccthomas@gmail.com.au"; github = "MajesticMullet"; From f2d29a86a54969312db8e119362768c429a62dac Mon Sep 17 00:00:00 2001 From: Luka Leer Date: Sun, 22 Sep 2024 22:48:28 +0200 Subject: [PATCH 2/4] python3Packages.mkdocs-git-committers-plugin-2: init at 2.3.0 Signed-off-by: Luka Leer --- .../default.nix | 43 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 45 insertions(+) create mode 100644 pkgs/development/python-modules/mkdocs-git-committers-plugin-2/default.nix diff --git a/pkgs/development/python-modules/mkdocs-git-committers-plugin-2/default.nix b/pkgs/development/python-modules/mkdocs-git-committers-plugin-2/default.nix new file mode 100644 index 0000000000000..6f2c74a192300 --- /dev/null +++ b/pkgs/development/python-modules/mkdocs-git-committers-plugin-2/default.nix @@ -0,0 +1,43 @@ +{ + # Evaluation + lib, + buildPythonPackage, + fetchFromGitHub, + pythonAtLeast, + + # Dependencies + gitpython, + mkdocs, + requests, +}: + +buildPythonPackage rec { + pname = "mkdocs-git-committers-plugin-2"; + version = "2.3.0"; + format = "setuptools"; + + disabled = !pythonAtLeast "3.8"; + + src = fetchFromGitHub { + owner = "ojacques"; + repo = "mkdocs-git-committers-plugin-2"; + rev = "refs/tags/${version}"; + hash = "sha256-+Ua2oX8PrfTROAhXNjcKdjIajVfvP3D3ToddFfj5N6A="; + }; + + propagatedBuildInputs = [ + gitpython + mkdocs + requests + ]; + + pythonImportsCheck = [ "mkdocs_git_committers_plugin_2" ]; + + meta = { + description = "MkDocs plugin for displaying a list of contributors on each page"; + homepage = "https://github.com/ojacques/mkdocs-git-committers-plugin-2"; + changelog = "https://github.com/ojacques/mkdocs-git-committers-plugin-2/releases/tag/${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ mahtaran ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6b4ce7eebdcce..907157ee8910d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8012,6 +8012,8 @@ self: super: with self; { mkdocs-git-authors-plugin = callPackage ../development/python-modules/mkdocs-git-authors-plugin { }; + mkdocs-git-committers-plugin-2 = callPackage ../development/python-modules/mkdocs-git-committers-plugin-2 { }; + mkdocs-git-revision-date-localized-plugin = callPackage ../development/python-modules/mkdocs-git-revision-date-localized-plugin { }; mkdocs-gitlab = callPackage ../development/python-modules/mkdocs-gitlab-plugin { }; From ac0f6061e5649e580b32d65b7cb5f5e4dd0815f0 Mon Sep 17 00:00:00 2001 From: Luka Leer Date: Sun, 6 Oct 2024 16:22:28 +0200 Subject: [PATCH 3/4] python3Packages.mkdocs-git-committers-plugin-2: 2.3.0 -> 2.4.1 Signed-off-by: Luka Leer --- .../python-modules/mkdocs-git-committers-plugin-2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mkdocs-git-committers-plugin-2/default.nix b/pkgs/development/python-modules/mkdocs-git-committers-plugin-2/default.nix index 6f2c74a192300..d96abb94f2583 100644 --- a/pkgs/development/python-modules/mkdocs-git-committers-plugin-2/default.nix +++ b/pkgs/development/python-modules/mkdocs-git-committers-plugin-2/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "mkdocs-git-committers-plugin-2"; - version = "2.3.0"; + version = "2.4.1"; format = "setuptools"; disabled = !pythonAtLeast "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "ojacques"; repo = "mkdocs-git-committers-plugin-2"; rev = "refs/tags/${version}"; - hash = "sha256-+Ua2oX8PrfTROAhXNjcKdjIajVfvP3D3ToddFfj5N6A="; + hash = "sha256-hKt0K5gOkdUDwTlyMTwodl4gD1RD+s+CM+zEpngSnlc="; }; propagatedBuildInputs = [ From fa99aa37aaefa664bc0842053d3da8f761da111c Mon Sep 17 00:00:00 2001 From: Luka Leer Date: Wed, 9 Oct 2024 01:42:50 +0200 Subject: [PATCH 4/4] python3Packages.mkdocs-git-committers-plugin-2: refactor Signed-off-by: Luka Leer --- .../mkdocs-git-committers-plugin-2/default.nix | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/mkdocs-git-committers-plugin-2/default.nix b/pkgs/development/python-modules/mkdocs-git-committers-plugin-2/default.nix index d96abb94f2583..6ff5a1c511014 100644 --- a/pkgs/development/python-modules/mkdocs-git-committers-plugin-2/default.nix +++ b/pkgs/development/python-modules/mkdocs-git-committers-plugin-2/default.nix @@ -3,7 +3,10 @@ lib, buildPythonPackage, fetchFromGitHub, - pythonAtLeast, + pythonOlder, + + # Build + setuptools, # Dependencies gitpython, @@ -14,9 +17,9 @@ buildPythonPackage rec { pname = "mkdocs-git-committers-plugin-2"; version = "2.4.1"; - format = "setuptools"; + pyproject = true; - disabled = !pythonAtLeast "3.8"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "ojacques"; @@ -25,12 +28,18 @@ buildPythonPackage rec { hash = "sha256-hKt0K5gOkdUDwTlyMTwodl4gD1RD+s+CM+zEpngSnlc="; }; - propagatedBuildInputs = [ + build-system = [ + setuptools + ]; + + dependencies = [ gitpython mkdocs requests ]; + # Upstream has no tests + doCheck = false; pythonImportsCheck = [ "mkdocs_git_committers_plugin_2" ]; meta = {