From e621bf7972b034f6a59394d88e124c6d218884d0 Mon Sep 17 00:00:00 2001 From: David Wood Date: Sat, 5 Oct 2019 12:59:58 +0100 Subject: [PATCH 1/2] ansi2html: init at 1.5.2 --- .../python-modules/ansi2html/default.nix | 23 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/development/python-modules/ansi2html/default.nix diff --git a/pkgs/development/python-modules/ansi2html/default.nix b/pkgs/development/python-modules/ansi2html/default.nix new file mode 100644 index 00000000000..2a705b53538 --- /dev/null +++ b/pkgs/development/python-modules/ansi2html/default.nix @@ -0,0 +1,23 @@ +{ lib, buildPythonPackage, fetchPypi, isPy3k, six, mock, nose, setuptools }: + +buildPythonPackage rec { + pname = "ansi2html"; + version = "1.5.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "1a9vihsvd03hb0a4dbiklyy686adp9q2ipl79mkxmdr6gfp8bbln"; + }; + + propagatedBuildInputs = [ six setuptools ]; + + checkInputs = [ mock nose ]; + + meta = with lib; { + description = "Convert text with ANSI color codes to HTML"; + homepage = http://github.com/ralphbean/ansi2html; + license = licenses.lgpl3Plus; + maintainers = with maintainers; [ davidtwco ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index efa8c4be094..b274a8257f6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -165,6 +165,8 @@ in { ansicolor = callPackage ../development/python-modules/ansicolor { }; + ansi2html = callPackage ../development/python-modules/ansi2html { }; + anytree = callPackage ../development/python-modules/anytree { inherit (pkgs) graphviz; }; From 7500c71e7b2ae63933de7292870e88d1465db496 Mon Sep 17 00:00:00 2001 From: David Wood Date: Sat, 5 Oct 2019 13:00:14 +0100 Subject: [PATCH 2/2] mdcat: init at 0.13.0 --- pkgs/tools/text/mdcat/default.nix | 32 +++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 5 +++++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/tools/text/mdcat/default.nix diff --git a/pkgs/tools/text/mdcat/default.nix b/pkgs/tools/text/mdcat/default.nix new file mode 100644 index 00000000000..9ebc9840b07 --- /dev/null +++ b/pkgs/tools/text/mdcat/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchFromGitHub, rustPlatform, pkgconfig, openssl, Security, ansi2html }: + +rustPlatform.buildRustPackage rec { + pname = "mdcat"; + version = "0.13.0"; + + src = fetchFromGitHub { + owner = "lunaryorn"; + repo = pname; + rev = "mdcat-${version}"; + sha256 = "0xlcpyfmil7sszv4008v4ipqswz49as4nzac0kzmzsb86np191q0"; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ (stdenv.lib.optional stdenv.isDarwin Security) openssl ]; + + cargoSha256 = "16q17gm59lpjqa18q289cjmjlf2jicag12jz529x5kh11x6bjl8v"; + + checkInputs = [ ansi2html ]; + checkPhase = '' + # Skip tests that use the network. + cargo test -- --skip terminal::iterm2 + ''; + + meta = with stdenv.lib; { + description = "cat for markdown"; + homepage = https://github.com/lunaryorn/mdcat; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ davidtwco ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fb906ed884a..fa05dda099a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4343,6 +4343,11 @@ in inherit (darwin.apple_sdk.frameworks) CoreServices; }; + mdcat = callPackage ../tools/text/mdcat { + inherit (darwin.apple_sdk.frameworks) Security; + inherit (pythonPackages) ansi2html; + }; + medfile = callPackage ../development/libraries/medfile { }; memtester = callPackage ../tools/system/memtester { };