diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-05-16 08:17:55 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-05-16 08:17:55 +0200 |
| commit | d4464ff8fece75890a0f2dd90bb1f20a833cfcec (patch) | |
| tree | de42715dd4311d6e7e5f0f697ec8f641f4bb7a33 /pkgs/tools/text | |
| parent | 8abe5ee07ee6b23fb014709f01bb161a62407a44 (diff) | |
| parent | a2aab0e413516f565a00d2d105684944c2bdabeb (diff) | |
| download | nixlib-d4464ff8fece75890a0f2dd90bb1f20a833cfcec.tar nixlib-d4464ff8fece75890a0f2dd90bb1f20a833cfcec.tar.gz nixlib-d4464ff8fece75890a0f2dd90bb1f20a833cfcec.tar.bz2 nixlib-d4464ff8fece75890a0f2dd90bb1f20a833cfcec.tar.lz nixlib-d4464ff8fece75890a0f2dd90bb1f20a833cfcec.tar.xz nixlib-d4464ff8fece75890a0f2dd90bb1f20a833cfcec.tar.zst nixlib-d4464ff8fece75890a0f2dd90bb1f20a833cfcec.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/tools/text')
| -rw-r--r-- | pkgs/tools/text/discount/default.nix | 16 |
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/; |