summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorJörg Thalheim <Mic92@users.noreply.github.com>2017-05-11 08:38:12 +0100
committerGitHub <noreply@github.com>2017-05-11 08:38:12 +0100
commit8b36a16b05450625f603c10ad726048933773a5e (patch)
tree8363fa0722512955cbed3b3a7e1b6ca913c2729d /pkgs
parent2ef92f0b5a492084da38bc0d6ccf49e401e276da (diff)
parente2a807cf128f37701a33b88aa1beccb9055aa652 (diff)
downloadnixpkgs-8b36a16b05450625f603c10ad726048933773a5e.tar
nixpkgs-8b36a16b05450625f603c10ad726048933773a5e.tar.gz
nixpkgs-8b36a16b05450625f603c10ad726048933773a5e.tar.bz2
nixpkgs-8b36a16b05450625f603c10ad726048933773a5e.tar.lz
nixpkgs-8b36a16b05450625f603c10ad726048933773a5e.tar.xz
nixpkgs-8b36a16b05450625f603c10ad726048933773a5e.tar.zst
nixpkgs-8b36a16b05450625f603c10ad726048933773a5e.zip
Merge pull request #25684 from andrewrk/update-cmark
cmark: 0.23.0 -> 0.27.1
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/development/libraries/cmark/default.nix25
1 files changed, 16 insertions, 9 deletions
diff --git a/pkgs/development/libraries/cmark/default.nix b/pkgs/development/libraries/cmark/default.nix
index 303a6ccaeb8..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.23.0";
+  version = "0.27.1";
   name = "cmark-${version}";
 
-  src = fetchurl {
-    url = "https://github.com/jgm/cmark/archive/${version}.tar.gz";
-    sha256 = "87d289965066fce7be247d44c0304af1b20817dcc1b563702302ae33f2be0596";
+  src = fetchFromGitHub {
+    owner = "jgm";
+    repo = "cmark";
+    rev = version;
+    sha256 = "06miwq3rl2bighkn6iq7bdwzmvcqa53qwpa0pqjqa8yn44j8ijj8";
   };
 
-  buildInputs = [ cmake ];
+  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;
   };
 }