From 33acfb8029ae9881aa15a839b7e72be4460bddc2 Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Wed, 10 May 2017 15:56:45 -0400 Subject: [PATCH 1/3] cmark: 0.23.0 -> 0.27.1 --- pkgs/development/libraries/cmark/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/cmark/default.nix b/pkgs/development/libraries/cmark/default.nix index 303a6ccaeb8..dceb042732d 100644 --- a/pkgs/development/libraries/cmark/default.nix +++ b/pkgs/development/libraries/cmark/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, cmake }: stdenv.mkDerivation rec { - version = "0.23.0"; + version = "0.27.1"; name = "cmark-${version}"; src = fetchurl { url = "https://github.com/jgm/cmark/archive/${version}.tar.gz"; - sha256 = "87d289965066fce7be247d44c0304af1b20817dcc1b563702302ae33f2be0596"; + sha256 = "1da62ispca9aal2a36gaj87175rv5013pl7x740vk32y6lclr6v6"; }; buildInputs = [ cmake ]; From 2dcc5bbb5d0aafd1b457e7decca67f5176fc177b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 11 May 2017 07:57:09 +0100 Subject: [PATCH 2/3] cmark: cmake in nativeBuildInputs --- pkgs/development/libraries/cmark/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/cmark/default.nix b/pkgs/development/libraries/cmark/default.nix index dceb042732d..16c3e28f248 100644 --- a/pkgs/development/libraries/cmark/default.nix +++ b/pkgs/development/libraries/cmark/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1da62ispca9aal2a36gaj87175rv5013pl7x740vk32y6lclr6v6"; }; - buildInputs = [ cmake ]; + nativeBuildInputs = [ cmake ]; meta = { description = "CommonMark parsing and rendering library and program in C"; From e2a807cf128f37701a33b88aa1beccb9055aa652 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 11 May 2017 08:35:54 +0100 Subject: [PATCH 3/3] cmark: enable tests --- pkgs/development/libraries/cmark/default.nix | 21 +++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/cmark/default.nix b/pkgs/development/libraries/cmark/default.nix index 16c3e28f248..5fdd1edfd97 100644 --- a/pkgs/development/libraries/cmark/default.nix +++ b/pkgs/development/libraries/cmark/default.nix @@ -1,20 +1,27 @@ -{ stdenv, fetchurl, cmake }: +{ stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { version = "0.27.1"; name = "cmark-${version}"; - src = fetchurl { - url = "https://github.com/jgm/cmark/archive/${version}.tar.gz"; - sha256 = "1da62ispca9aal2a36gaj87175rv5013pl7x740vk32y6lclr6v6"; + src = fetchFromGitHub { + owner = "jgm"; + repo = "cmark"; + rev = version; + sha256 = "06miwq3rl2bighkn6iq7bdwzmvcqa53qwpa0pqjqa8yn44j8ijj8"; }; nativeBuildInputs = [ cmake ]; + doCheck = true; + checkPhase = '' + export LD_LIBRARY_PATH=$(readlink -f ./src) + CTEST_OUTPUT_ON_FAILURE=1 make test + ''; - meta = { + meta = with stdenv.lib; { description = "CommonMark parsing and rendering library and program in C"; homepage = https://github.com/jgm/cmark; - maintainers = [ stdenv.lib.maintainers.michelk ]; - platforms = stdenv.lib.platforms.unix; + maintainers = [ maintainers.michelk ]; + platforms = platforms.unix; }; }