From 2e214d0c96f556be4a3a68af8f5d9167b807abef Mon Sep 17 00:00:00 2001 From: Luka Leer Date: Sun, 22 Sep 2024 22:06:02 +0200 Subject: [PATCH 1/5] 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 67481034a7ee749..7ffde8eeffd5ad0 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -12653,6 +12653,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 4e2056d7c98cdd243c89e1c849f733531c3e3ac3 Mon Sep 17 00:00:00 2001 From: Luka Leer Date: Sun, 22 Sep 2024 22:48:28 +0200 Subject: [PATCH 2/5] 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 000000000000000..6f2c74a1923001c --- /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 d53787ea328e906..1e021d58013e33c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7946,6 +7946,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 b30ee246727486f44936130658a93fae6f7f4d8d Mon Sep 17 00:00:00 2001 From: Luka Leer Date: Sun, 22 Sep 2024 22:48:53 +0200 Subject: [PATCH 3/5] python3Packages.mkdocs-material-insiders: init at 9.5.36-insiders-4.53.13 Signed-off-by: Luka Leer --- .../mkdocs-material-insiders/default.nix | 103 ++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 105 insertions(+) create mode 100644 pkgs/development/python-modules/mkdocs-material-insiders/default.nix diff --git a/pkgs/development/python-modules/mkdocs-material-insiders/default.nix b/pkgs/development/python-modules/mkdocs-material-insiders/default.nix new file mode 100644 index 000000000000000..7fb89f3c0ac19b0 --- /dev/null +++ b/pkgs/development/python-modules/mkdocs-material-insiders/default.nix @@ -0,0 +1,103 @@ +{ + # Evaluation + lib, + buildPythonPackage, + fetchFromGitHub, + pythonAtLeast, + + # Build + hatchling, + hatch-requirements-txt, + hatch-nodejs-version, + trove-classifiers, + + # Dependencies + jinja2, + markdown, + mkdocs, + mkdocs-material-extensions, + pygments, + pymdown-extensions, + babel, + colorama, + mergedeep, + paginate, + regex, + requests, + + # Optional dependencies + mkdocs-minify-plugin, + mkdocs-redirects, + mkdocs-rss-plugin, + mkdocs-git-committers-plugin-2, + mkdocs-git-revision-date-localized-plugin, + pillow, + cairosvg, +}: + +buildPythonPackage rec { + pname = "mkdocs-material"; + version = "9.5.36-insiders-4.53.13"; + pyproject = true; + + src = fetchFromGitHub { + owner = "squidfunk"; + repo = "mkdocs-material-insiders"; + private = true; + rev = "refs/tags/${version}"; + hash = "sha256-jmu3TftFtNwLTTy1O14+nDQtyqlUB3uUTrFYlEsFM1A="; + }; + + disabled = !pythonAtLeast "3.8"; + + nativeBuildInputs = [ + hatchling + hatch-requirements-txt + hatch-nodejs-version + trove-classifiers + ]; + + propagatedBuildInputs = [ + jinja2 + markdown + mkdocs + mkdocs-material-extensions + pygments + pymdown-extensions + babel + colorama + mergedeep + paginate + regex + requests + ]; + + passthru.optional-dependencies = { + recommended = [ + mkdocs-minify-plugin + mkdocs-redirects + mkdocs-rss-plugin + ]; + + git = [ + mkdocs-git-committers-plugin-2 + mkdocs-git-revision-date-localized-plugin + ]; + + imaging = [ + pillow + cairosvg + ]; + }; + + pythonImportsCheck = [ "material" ]; + + meta = { + changelog = "https://github.com/squidfunk/mkdocs-material-insiders/blob/${version}/CHANGELOG"; + description = "Sponsor's edition of Material for MkDocs"; + downloadPage = "https://github.com/squidfunk/mkdocs-material-insiders"; + homepage = "https://squidfunk.github.io/mkdocs-material/insiders"; + 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 1e021d58013e33c..857b933d82672c1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7962,6 +7962,8 @@ self: super: with self; { mkdocs-material-extensions = callPackage ../development/python-modules/mkdocs-material/mkdocs-material-extensions.nix { }; + mkdocs-material-insiders = callPackage ../development/python-modules/mkdocs-material-insiders { }; + mkdocs-mermaid2-plugin = callPackage ../development/python-modules/mkdocs-mermaid2-plugin { }; mkdocs-minify-plugin = callPackage ../development/python-modules/mkdocs-minify-plugin { }; From 4d6a272c371acc0d28cda5dfeae9db6b7298a949 Mon Sep 17 00:00:00 2001 From: Luka Leer Date: Thu, 26 Sep 2024 12:04:52 +0200 Subject: [PATCH 4/5] python3Packages.mkdocs-material-insiders: 9.5.36-insiders-4.53.13 -> 9.5.38-insiders-4.53.13 Signed-off-by: Luka Leer --- .../python-modules/mkdocs-material-insiders/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mkdocs-material-insiders/default.nix b/pkgs/development/python-modules/mkdocs-material-insiders/default.nix index 7fb89f3c0ac19b0..80c776434a8d79a 100644 --- a/pkgs/development/python-modules/mkdocs-material-insiders/default.nix +++ b/pkgs/development/python-modules/mkdocs-material-insiders/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { pname = "mkdocs-material"; - version = "9.5.36-insiders-4.53.13"; + version = "9.5.38-insiders-4.53.13"; pyproject = true; src = fetchFromGitHub { @@ -45,7 +45,7 @@ buildPythonPackage rec { repo = "mkdocs-material-insiders"; private = true; rev = "refs/tags/${version}"; - hash = "sha256-jmu3TftFtNwLTTy1O14+nDQtyqlUB3uUTrFYlEsFM1A="; + hash = "sha256-obfepPMQnq8m3P4/kT0nPlIF8w441xqhAWOFro7cHhU="; }; disabled = !pythonAtLeast "3.8"; From e2d9a7f5d9938adfccdbb3775e65b28bb1688657 Mon Sep 17 00:00:00 2001 From: Luka Leer Date: Sun, 29 Sep 2024 21:49:35 +0200 Subject: [PATCH 5/5] python3Packages.mkdocs-material-insiders: 9.5.38-insiders-4.53.13 -> 9.5.39-insiders-4.53.14 Signed-off-by: Luka Leer --- .../mkdocs-material-insiders/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/mkdocs-material-insiders/default.nix b/pkgs/development/python-modules/mkdocs-material-insiders/default.nix index 80c776434a8d79a..b8c2aea0fd4948b 100644 --- a/pkgs/development/python-modules/mkdocs-material-insiders/default.nix +++ b/pkgs/development/python-modules/mkdocs-material-insiders/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { pname = "mkdocs-material"; - version = "9.5.38-insiders-4.53.13"; + version = "9.5.39-insiders-4.53.14"; pyproject = true; src = fetchFromGitHub { @@ -45,19 +45,19 @@ buildPythonPackage rec { repo = "mkdocs-material-insiders"; private = true; rev = "refs/tags/${version}"; - hash = "sha256-obfepPMQnq8m3P4/kT0nPlIF8w441xqhAWOFro7cHhU="; + hash = "sha256-MJGv9r7T/kkaD76At3nLEaTO1daBJiNPypnRIIN4MSU="; }; disabled = !pythonAtLeast "3.8"; - nativeBuildInputs = [ + build-system = [ hatchling hatch-requirements-txt hatch-nodejs-version trove-classifiers ]; - propagatedBuildInputs = [ + dependencies = [ jinja2 markdown mkdocs @@ -72,7 +72,7 @@ buildPythonPackage rec { requests ]; - passthru.optional-dependencies = { + optional-dependencies = { recommended = [ mkdocs-minify-plugin mkdocs-redirects