diff --git a/pkgs/tools/typesetting/mmark/default.nix b/pkgs/tools/typesetting/mmark/default.nix index bc5ddcc9d751..85f4bfad1187 100644 --- a/pkgs/tools/typesetting/mmark/default.nix +++ b/pkgs/tools/typesetting/mmark/default.nix @@ -1,24 +1,27 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, testers, mmark }: -buildGoPackage rec { +buildGoModule rec { pname = "mmark"; - version = "1.3.6"; - rev = "v${version}"; - - goPackagePath = "github.com/miekg/mmark"; + version = "2.2.25"; src = fetchFromGitHub { - inherit rev; - owner = "miekg"; + owner = "mmarkdown"; repo = "mmark"; - sha256 = "0q2zrwa2vwk7a0zhmi000zpqrc01zssrj9c5n3573rg68fksg77m"; + rev = "v${version}"; + sha256 = "sha256-9XjNTbsB4kh7YpjUnTzSXypw9r4ZyR7GALTrYebRKAg="; }; - goDeps = ./deps.nix; + vendorSha256 = "sha256-uHphMy9OVnLD6IBqfMTyRlDyyTabzZC4Vn0628P+0F4="; + + ldflags = [ "-s" "-w" ]; + + passthru.tests.version = testers.testVersion { + package = mmark; + }; meta = { description = "A powerful markdown processor in Go geared towards the IETF"; - homepage = "https://github.com/miekg/mmark"; + homepage = "https://github.com/mmarkdown/mmark"; license = with lib.licenses; bsd2; maintainers = with lib.maintainers; [ yrashk ]; platforms = lib.platforms.unix; diff --git a/pkgs/tools/typesetting/mmark/deps.nix b/pkgs/tools/typesetting/mmark/deps.nix deleted file mode 100644 index 47f964c6a477..000000000000 --- a/pkgs/tools/typesetting/mmark/deps.nix +++ /dev/null @@ -1,12 +0,0 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 -[ - { - goPackagePath = "github.com/BurntSushi/toml"; - fetch = { - type = "git"; - url = "https://github.com/BurntSushi/toml"; - rev = "a368813c5e648fee92e5f6c30e3944ff9d5e8895"; - sha256 = "1sjxs2lwc8jpln80s4rlzp7nprbcljhy5mz4rf9995gq93wqnym5"; - }; - } -]