diff --git a/pkgs/tools/typesetting/multimarkdown/default.nix b/pkgs/tools/typesetting/multimarkdown/default.nix index 45be0709322..6dfbc82af31 100644 --- a/pkgs/tools/typesetting/multimarkdown/default.nix +++ b/pkgs/tools/typesetting/multimarkdown/default.nix @@ -1,25 +1,34 @@ -{ lib, stdenv, fetchgit, perl }: +{ lib +, stdenv +, fetchFromGitHub +, cmake +, perl +, pkg-config +}: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "multimarkdown"; - version = "4.7.1"; + version = "6.6.0"; - src = fetchgit { - url = "https://github.com/fletcher/MultiMarkdown-4.git"; - fetchSubmodules = true; - rev = "dd060247518715ef2b52be22b8f49d0e6d2c3a8b"; - sha256 = "11f246r30q2fx4xw7valhqjj4mc4ydj5fv5f2kbl5h93y69q0bw7"; + src = fetchFromGitHub { + owner = "fletcher"; + repo = "MultiMarkdown-6"; + rev = version; + hash = "sha256-emJbY0wucoc/GdjlILoeqjwuwuPpTjXTqZN0gUKOyLg="; }; - preBuild = '' - substituteInPlace enumsToPerl.pl --replace "/usr/bin/perl" "${perl}/bin/perl" + postPatch = '' + patchShebangs tools/enumsToPerl.pl ''; - buildInputs = [ stdenv ]; - checkPhase = "make test-all"; - installPhase = "make pkg-install prefix='' DESTDIR=$out; make pkg-install-scripts prefix='' DESTDIR=$out"; + nativeBuildInputs = [ + cmake + perl + pkg-config + ]; meta = with lib; { + homepage = "https://fletcher.github.io/MultiMarkdown-6/introduction.html"; description = "A derivative of Markdown that adds new syntax features"; longDescription = '' MultiMarkdown is a lightweight markup language created by @@ -30,23 +39,20 @@ stdenv.mkDerivation { It adds the following features to Markdown: - footnotes - tables - citations and bibliography (works best in LaTeX using BibTeX) - math support - automatic cross-referencing ability - smart typography, with support for multiple languages - image attributes - table and image captions - definition lists - glossary entries (LaTeX only) - document metadata (e.g. title, author, date, etc.) + - footnotes + - tables + - citations and bibliography (works best in LaTeX using BibTeX) + - math support + - automatic cross-referencing ability + - smart typography, with support for multiple languages + - image attributes + - table and image captions + - definition lists + - glossary entries (LaTeX only) + - document metadata (e.g. title, author, date, etc.) ''; - homepage = "https://fletcherpenney.net/multimarkdown/"; - # licensed under GPLv2+ or MIT: - # https://raw.githubusercontent.com/fletcher/MultiMarkdown-4/master/LICENSE - license = with lib.licenses; [ gpl2Plus mit ]; + license = with licenses; [ mit ]; platforms = platforms.all; - maintainers = with lib.maintainers; [ lowfatcomputing ]; + maintainers = with maintainers; [ AndersonTorres ]; }; }