From c52889228024eb306a05418e63f8350be2492eff Mon Sep 17 00:00:00 2001 From: Ram Kromberg Date: Sun, 11 Sep 2016 23:18:13 +0300 Subject: [PATCH 1/2] mandoc: init at 1.13.4 --- pkgs/tools/misc/mandoc/default.nix | 35 ++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/tools/misc/mandoc/default.nix diff --git a/pkgs/tools/misc/mandoc/default.nix b/pkgs/tools/misc/mandoc/default.nix new file mode 100644 index 00000000000..297d6557f5e --- /dev/null +++ b/pkgs/tools/misc/mandoc/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchurl, zlib }: + +stdenv.mkDerivation rec { + name = "mandoc-${version}"; + version = "1.13.4"; + + src = fetchurl { + url = "http://mdocml.bsd.lv/snapshots/mdocml-${version}.tar.gz"; + sha256 = "1vz0g5nvjbz1ckrg9cn6ivlnb13bcl1r6nc4yzb7300qvfnw2m8a"; + }; + + buildInputs = [ zlib ]; + + configureLocal = '' + HAVE_WCHAR=1 + MANPATH_DEFAULT="/run/current-system/sw/share/man" + OSNAME="NixOS" + PREFIX="$out" + HAVE_MANPATH=1 + LD_OHASH="-lutil" + BUILD_DB=0 + ''; + + preConfigure = '' + echo $configureLocal > configure.local + ''; + + meta = with stdenv.lib; { + homepage = "http://mdocml.bsd.lv/"; + description = "suite of tools compiling mdoc and man"; + license = licenses.bsd3; + platforms = platforms.all; + maintainers = with maintainers; [ ramkromberg ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bb26652913b..cd970d7cda0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2565,6 +2565,8 @@ in man-db = callPackage ../tools/misc/man-db { }; + mandoc = callPackage ../tools/misc/mandoc { }; + mawk = callPackage ../tools/text/mawk { }; mbox = callPackage ../tools/security/mbox { }; From 7238a94584ae6301cfcfa8e180c3356f6439d720 Mon Sep 17 00:00:00 2001 From: Ram Kromberg Date: Thu, 15 Sep 2016 03:32:08 +0300 Subject: [PATCH 2/2] bsdbuild: groff -> mandoc --- pkgs/development/tools/misc/bsdbuild/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/bsdbuild/default.nix b/pkgs/development/tools/misc/bsdbuild/default.nix index 0fd9f143ce9..359ab125be9 100644 --- a/pkgs/development/tools/misc/bsdbuild/default.nix +++ b/pkgs/development/tools/misc/bsdbuild/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, libtool, pkgconfig, gettext, groff, ed }: +{ stdenv, fetchurl, perl, libtool, pkgconfig, gettext, mandoc, ed }: stdenv.mkDerivation rec { name = "bsdbuild-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1zrdjh7a6z4khhfw9zrp490afq306cpl5v8wqz2z55ys7k1n5ifl"; }; - buildInputs = [ perl groff ed ]; + buildInputs = [ perl mandoc ed ]; nativeBuildInputs = [ pkgconfig libtool gettext ]; prePatch = ''