Merge pull request #144537 from prusnak/clightning

clightning: 0.10.1 -> 0.10.2
This commit is contained in:
Pavol Rusnak 2021-11-04 09:02:24 +01:00 committed by GitHub
commit 1e207ecd49
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 35 additions and 3 deletions

View file

@ -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 ];

View file

@ -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;
};
}

View file

@ -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 { };

View file

@ -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 { };