summaryrefslogtreecommitdiffstats
path: root/pkgs/tools/text
diff options
context:
space:
mode:
authorWill Dietz <w@wdtz.org>2019-05-06 08:44:40 -0500
committerworldofpeace <worldofpeace@protonmail.ch>2019-05-15 19:44:59 -0400
commitcb1cf0959d0c42a274581064959bf23d33291db8 (patch)
tree8195b6d93b91f19c8133bef36855ab31deb2568c /pkgs/tools/text
parentd0ea2df4fbc9db734f8e422e75fa062ab9d417eb (diff)
discount: 2.2.4 -> 2.2.6, tests
Now using the GitHub source. https://github.com/Orc/discount/releases/tag/v2.2.5 https://github.com/Orc/discount/releases/tag/v2.2.6
Diffstat (limited to 'pkgs/tools/text')
-rw-r--r--pkgs/tools/text/discount/default.nix16
1 files changed, 10 insertions, 6 deletions
diff --git a/pkgs/tools/text/discount/default.nix b/pkgs/tools/text/discount/default.nix
index 69fce7a109cc..34e1c3b0ace4 100644
--- a/pkgs/tools/text/discount/default.nix
+++ b/pkgs/tools/text/discount/default.nix
@@ -1,12 +1,14 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, fetchFromGitHub }:
stdenv.mkDerivation rec {
- version = "2.2.4";
- name = "discount-${version}";
+ version = "2.2.6";
+ pname = "discount";
- src = fetchurl {
- url = "http://www.pell.portland.or.us/~orc/Code/discount/discount-${version}.tar.bz2";
- sha256 = "199hwajpspqil0a4y3yxsmhdp2dm73gqkzfk4mrwzsmlq8y1xzbl";
+ src = fetchFromGitHub {
+ owner = "Orc";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "1y066jkxfas0vdixbqq66j9p00a102sbfgq5gbrblfczqjrmc38w";
};
patches = ./fix-configure-path.patch;
@@ -19,6 +21,8 @@ stdenv.mkDerivation rec {
"--with-fenced-code"
];
+ doCheck = true;
+
meta = with stdenv.lib; {
description = "Implementation of Markdown markup language in C";
homepage = http://www.pell.portland.or.us/~orc/Code/discount/;