diff --git a/pkgs/applications/blockchains/clightning/default.nix b/pkgs/applications/blockchains/clightning/default.nix index 0cec96b7a6ee..04f3c1fcbc84 100644 --- a/pkgs/applications/blockchains/clightning/default.nix +++ b/pkgs/applications/blockchains/clightning/default.nix @@ -16,15 +16,15 @@ , zlib }: let - py3 = python3.withPackages (p: [ p.Mako ]); + py3 = python3.withPackages (p: [ p.Mako p.mrkd ]); in stdenv.mkDerivation rec { pname = "clightning"; - version = "0.10.1"; + version = "0.10.2"; src = fetchurl { url = "https://github.com/ElementsProject/lightning/releases/download/v${version}/clightning-v${version}.zip"; - sha256 = "9271e9e89d60332b66afedbf8d6eab2a4a488782ab400ee1f60667d73c5a9a96"; + sha256 = "3c9dcb686217b2efe0e988e90b95777c4591e3335e259e01a94af87e0bf01809"; }; nativeBuildInputs = [ autogen autoconf automake gettext libtool pkg-config py3 unzip which ]; diff --git a/pkgs/development/python-modules/mrkd/default.nix b/pkgs/development/python-modules/mrkd/default.nix new file mode 100644 index 000000000000..22cd93910d6b --- /dev/null +++ b/pkgs/development/python-modules/mrkd/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, fetchPypi +, jinja2 +, mistune +, pygments +, setuptools +}: + +buildPythonPackage rec { + pname = "mrkd"; + version = "0.2.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "456f8c1be99da268554b29c6b5383532e58119def5a65d85270bc6a0ecc26aaf"; + }; + + propagatedBuildInputs = [ jinja2 mistune pygments setuptools ]; + + pythonImportsCheck = [ "mrkd" ]; + + meta = with lib; { + description = "Write man pages using Markdown, and convert them to Roff or HTML"; + homepage = "https://github.com/refi64/mrkd"; + license = licenses.bsd2; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 91bbb33fc153..c403d33634ef 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3321,6 +3321,8 @@ with pkgs; mq-cli = callPackage ../tools/system/mq-cli { }; + mrkd = with python3Packages; toPythonApplication mrkd; + n2n = callPackage ../tools/networking/n2n { }; nextdns = callPackage ../applications/networking/nextdns { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3178b4994ce9..595967fa63b3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4878,6 +4878,8 @@ in { mpyq = callPackage ../development/python-modules/mpyq { }; + mrkd = callPackage ../development/python-modules/mrkd { }; + ms-cv = callPackage ../development/python-modules/ms-cv { }; msal = callPackage ../development/python-modules/msal { };