From dc07aeb38ddb41a68bf22969e9bce40ae9d4f73b Mon Sep 17 00:00:00 2001 From: Daniel Olsen Date: Mon, 7 Mar 2022 23:01:05 +0100 Subject: [PATCH 1/4] python3Packages.mkdocs-material: init at 8.2.5 --- .../mkdocs-material/default.nix | 41 +++++++++++++++++++ .../mkdocs-material-extensions.nix | 24 +++++++++++ pkgs/top-level/python-packages.nix | 2 + 3 files changed, 67 insertions(+) create mode 100644 pkgs/development/python-modules/mkdocs-material/default.nix create mode 100644 pkgs/development/python-modules/mkdocs-material/mkdocs-material-extensions.nix diff --git a/pkgs/development/python-modules/mkdocs-material/default.nix b/pkgs/development/python-modules/mkdocs-material/default.nix new file mode 100644 index 000000000000..16a815809169 --- /dev/null +++ b/pkgs/development/python-modules/mkdocs-material/default.nix @@ -0,0 +1,41 @@ +{ lib, callPackage, buildPythonApplication, fetchFromGitHub +, jinja2 +, markdown +, mkdocs +, mkdocs-material-extensions +, pygments +, pymdown-extensions +}: + +buildPythonApplication rec { + pname = "mkdocs-material"; + version = "8.2.5"; + + src = fetchFromGitHub { + owner = "squidfunk"; + repo = pname; + rev = version; + sha256 = "0v30x2cgc5i307p0hsy5h58pfd8w6xpnvimsb75614xlmx3ycaqd"; + }; + + propagatedBuildInputs = [ + jinja2 + markdown + mkdocs + mkdocs-material-extensions + pygments + pymdown-extensions + ]; + + # No tests for python + doCheck = false; + + pythonImportsCheck = [ "mkdocs" ]; + + meta = with lib; { + description = "Material for mkdocs"; + homepage = "https://squidfunk.github.io/mkdocs-material/"; + license = licenses.mit; + maintainers = with maintainers; [ dandellion ]; + }; +} diff --git a/pkgs/development/python-modules/mkdocs-material/mkdocs-material-extensions.nix b/pkgs/development/python-modules/mkdocs-material/mkdocs-material-extensions.nix new file mode 100644 index 000000000000..2d03c8fa8c5d --- /dev/null +++ b/pkgs/development/python-modules/mkdocs-material/mkdocs-material-extensions.nix @@ -0,0 +1,24 @@ +{ lib, fetchFromGitHub, buildPythonPackage }: + +buildPythonPackage rec { + pname = "mkdocs-material-extensions"; + version = "1.0.3"; + + src = fetchFromGitHub { + owner = "facelessuser"; + repo = pname; + rev = version; + sha256 = "1mvc13lz16apnli2qcqf0dvlm8mshy47jmz2vp72lja6x8jfq2p3"; + }; + + doCheck = false; # Circular dependency + + pythonImportsCheck = [ "materialx" ]; + + meta = with lib; { + description = "Markdown extension resources for MkDocs Material"; + homepage = "https://github.com/facelessuser/mkdocs-material-extensions"; + license = licenses.mit; + maintainers = with maintainers; [ dandellion ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 92da9eec9a6e..8dbb808adabe 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5157,6 +5157,8 @@ in { mizani = callPackage ../development/python-modules/mizani { }; mkdocs = callPackage ../development/python-modules/mkdocs { }; + mkdocs-material = callPackage ../development/python-modules/mkdocs-material { }; + mkdocs-material-extensions = callPackage ../development/python-modules/mkdocs-material/mkdocs-material-extensions.nix { }; mkl-service = callPackage ../development/python-modules/mkl-service { }; From 265e57233dfcb2f213094126779812a1725ca7fa Mon Sep 17 00:00:00 2001 From: Daniel Olsen Date: Thu, 3 Mar 2022 00:32:30 +0100 Subject: [PATCH 2/4] hydrus: 474 -> 475 --- pkgs/applications/graphics/hydrus/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/hydrus/default.nix b/pkgs/applications/graphics/hydrus/default.nix index 12e605f80c4f..0b4c05ad5699 100644 --- a/pkgs/applications/graphics/hydrus/default.nix +++ b/pkgs/applications/graphics/hydrus/default.nix @@ -10,18 +10,19 @@ python3Packages.buildPythonPackage rec { pname = "hydrus"; - version = "474"; + version = "475"; format = "other"; src = fetchFromGitHub { owner = "hydrusnetwork"; repo = "hydrus"; rev = "v${version}"; - sha256 = "sha256-NeTHq8zlgBajw/eogwpabqeU0b7cp83Frqy6kisrths="; + sha256 = "sha256-RgsiREczdI+R4BcETqEpYa70s86m6BZLB0l0R2Py+Lk="; }; nativeBuildInputs = [ wrapQtAppsHook + python3Packages.mkdocs-material ]; propagatedBuildInputs = with python3Packages; [ @@ -85,6 +86,7 @@ python3Packages.buildPythonPackage rec { # Move the hydrus module and related directories mkdir -p $out/${python3Packages.python.sitePackages} mv {hydrus,static} $out/${python3Packages.python.sitePackages} + mkdocs build -d help mv help $out/doc/ # install the hydrus binaries From 8afbf99747e9c0eff46e4e02cee8f1f37d6552b0 Mon Sep 17 00:00:00 2001 From: Daniel Olsen Date: Wed, 9 Mar 2022 23:29:22 +0100 Subject: [PATCH 3/4] hydrus: 475 -> 476 --- pkgs/applications/graphics/hydrus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/hydrus/default.nix b/pkgs/applications/graphics/hydrus/default.nix index 0b4c05ad5699..3527cc74a792 100644 --- a/pkgs/applications/graphics/hydrus/default.nix +++ b/pkgs/applications/graphics/hydrus/default.nix @@ -10,14 +10,14 @@ python3Packages.buildPythonPackage rec { pname = "hydrus"; - version = "475"; + version = "476"; format = "other"; src = fetchFromGitHub { owner = "hydrusnetwork"; repo = "hydrus"; rev = "v${version}"; - sha256 = "sha256-RgsiREczdI+R4BcETqEpYa70s86m6BZLB0l0R2Py+Lk="; + sha256 = "sha256-hosLIKCuoQSpuDBvmghbn/edMU7O6tvjiZb983MgWJQ="; }; nativeBuildInputs = [ From d216b6ab039217d8538f1ebd32b1272c1f00b5f0 Mon Sep 17 00:00:00 2001 From: Daniel Olsen Date: Fri, 18 Mar 2022 22:38:03 +0100 Subject: [PATCH 4/4] hydrus: 477 -> 477 --- pkgs/applications/graphics/hydrus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/hydrus/default.nix b/pkgs/applications/graphics/hydrus/default.nix index 3527cc74a792..fba158efacbe 100644 --- a/pkgs/applications/graphics/hydrus/default.nix +++ b/pkgs/applications/graphics/hydrus/default.nix @@ -10,14 +10,14 @@ python3Packages.buildPythonPackage rec { pname = "hydrus"; - version = "476"; + version = "477"; format = "other"; src = fetchFromGitHub { owner = "hydrusnetwork"; repo = "hydrus"; rev = "v${version}"; - sha256 = "sha256-hosLIKCuoQSpuDBvmghbn/edMU7O6tvjiZb983MgWJQ="; + sha256 = "sha256-/Gehlk+eMBPA+OT7xsTri6PDi2PBmzjckMVbqPGXT64="; }; nativeBuildInputs = [