From e56a6c1bec7ddf8e2aec5ca84994da888b02d393 Mon Sep 17 00:00:00 2001 From: Shell Turner Date: Fri, 10 Oct 2014 15:58:11 +0100 Subject: [PATCH 1/2] discount: new package --- pkgs/tools/text/discount/default.nix | 18 ++++++++++++++++++ .../text/discount/fix-configure-path.patch | 12 ++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 32 insertions(+) create mode 100644 pkgs/tools/text/discount/default.nix create mode 100644 pkgs/tools/text/discount/fix-configure-path.patch diff --git a/pkgs/tools/text/discount/default.nix b/pkgs/tools/text/discount/default.nix new file mode 100644 index 00000000000..7b902202a4c --- /dev/null +++ b/pkgs/tools/text/discount/default.nix @@ -0,0 +1,18 @@ +{stdenv, fetchurl}: +stdenv.mkDerivation rec { + version = "2.1.6"; + name = "discount-${version}"; + + src = fetchurl { + url = "http://www.pell.portland.or.us/~orc/Code/discount/discount-${version}.tar.bz2"; + sha256 = "15h726m5yalq15hkxxfw4bxwd6wkwkan5q7s80pgi1z32ygb4avh"; + }; + patches = ./fix-configure-path.patch; + configureScript = "./configure.sh"; + + meta = with stdenv.lib; { + description = "Implementation of Markdown markup language in C"; + homepage = "http://www.pell.portland.or.us/~orc/Code/discount/"; + license = licenses.bsd3; + }; +} diff --git a/pkgs/tools/text/discount/fix-configure-path.patch b/pkgs/tools/text/discount/fix-configure-path.patch new file mode 100644 index 00000000000..045b369b4b6 --- /dev/null +++ b/pkgs/tools/text/discount/fix-configure-path.patch @@ -0,0 +1,12 @@ +diff -rupN discount-2.1.6-original/configure.inc discount-2.1.6/configure.inc +--- discount-2.1.6-original/configure.inc 2014-10-10 15:34:24.158325345 +0100 ++++ discount-2.1.6/configure.inc 2014-10-10 15:34:33.553325321 +0100 +@@ -32,7 +32,7 @@ + # this preamble code is executed when this file is sourced and it picks + # interesting things off the command line. + # +-ac_default_path="/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin" ++ac_default_path=$PATH + + ac_standard="--src=DIR where the source lives (.) + --prefix=DIR where to install the final product (/usr/local) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 21381e7ac95..9aad7efdf55 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -665,6 +665,8 @@ let direnv = callPackage ../tools/misc/direnv { }; + discount = callPackage ../tools/text/discount { }; + ditaa = callPackage ../tools/graphics/ditaa { }; dlx = callPackage ../misc/emulators/dlx { }; From 0b649538b2ba1fd12d01b553ba7521946c4bbe68 Mon Sep 17 00:00:00 2001 From: Shell Turner Date: Sun, 12 Oct 2014 12:09:07 +0100 Subject: [PATCH 2/2] discount: Added shell as maintainer --- lib/maintainers.nix | 1 + pkgs/tools/text/discount/default.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index aedec427ab4..ae864a8a27a 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -118,6 +118,7 @@ rycee = "Robert Helgesson "; sander = "Sander van der Burg "; sepi = "Raffael Mancini "; + shell = "Shell Turner "; shlevy = "Shea Levy "; simons = "Peter Simons "; skeidel = "Sven Keidel "; diff --git a/pkgs/tools/text/discount/default.nix b/pkgs/tools/text/discount/default.nix index 7b902202a4c..ff846ac0933 100644 --- a/pkgs/tools/text/discount/default.nix +++ b/pkgs/tools/text/discount/default.nix @@ -14,5 +14,6 @@ stdenv.mkDerivation rec { description = "Implementation of Markdown markup language in C"; homepage = "http://www.pell.portland.or.us/~orc/Code/discount/"; license = licenses.bsd3; + maintainers = [ maintainers.shell ]; }; }