Skip to content
Permalink
Browse files

groff: 1.22.3 -> 1.22.4

  • Loading branch information
pSub committed Feb 25, 2019
1 parent dffba87 commit 3446e4cc8eb888cc5201ed988098c5f1e556ba16
@@ -3,23 +3,24 @@
, psutils, netpbm #for html output
, buildPackages
, autoreconfHook
, pkgconfig
, texinfo
}:

stdenv.mkDerivation rec {
name = "groff-${version}";
version = "1.22.3";
version = "1.22.4";

src = fetchurl {
url = "mirror://gnu/groff/${name}.tar.gz";
sha256 = "1998v2kcs288d3y7kfxpvl369nqi06zbbvjzafyvyl3pr7bajj1s";
sha256 = "14q2mldnr1vx0l9lqp9v2f6iww24gj28iyh4j2211hyynx67p3p7";
};

outputs = [ "out" "man" "doc" "info" "perl" ];

enableParallelBuilding = false;

patches = [
./look-for-ar.patch
./mdate-determinism.patch
];

@@ -37,8 +38,8 @@ stdenv.mkDerivation rec {
--replace "@PNMTOPS_NOSETPAGE@" "${netpbm}/bin/pnmtops -nosetpage"
'';

buildInputs = [ ghostscript psutils netpbm perl ];
nativeBuildInputs = [ autoreconfHook ];
buildInputs = [ ghostscript psutils netpbm perl texinfo ];
nativeBuildInputs = [ autoreconfHook pkgconfig ];

# Builds running without a chroot environment may detect the presence
# of /usr/X11 in the host system, leading to an impure build of the
@@ -65,10 +66,10 @@ stdenv.mkDerivation rec {
# Remove example output with (random?) colors and creation date
# to avoid non-determinism in the output.
postInstall = ''
rm "$doc"/share/doc/groff/examples/hdtbl/*color*ps
find "$doc"/share/doc/groff/ -type f -print0 | xargs -0 sed -i -e 's/%%CreationDate: .*//'
rm $out/share/doc/${name}/examples/hdtbl/*color*ps
find $out/share/doc/${name}/ -type f -print0 | xargs -0 sed -i -e 's/%%CreationDate: .*//'
for f in 'man.local' 'mdoc.local'; do
cat '${./site.tmac}' >>"$out/share/groff/site-tmac/$f"
cat '${./site.tmac}' >> "share/groff/site-tmac/$f"
done
moveToOutput bin/gropdf $perl

This file was deleted.

@@ -1,13 +1,13 @@
diff --git a/Makefile.comm b/Makefile.comm
index 75efc22..b757000 100644
--- a/Makefile.comm
+++ b/Makefile.comm
@@ -155,7 +155,7 @@ extraclean: distclean
-e "s|@MAN1EXT@|$(man1ext)|g" \
-e "s|@MAN5EXT@|$(man5ext)|g" \
-e "s|@MAN7EXT@|$(man7ext)|g" \
- -e "s|@MDATE@|`$(SHELL) $(top_srcdir)/mdate.sh $<`|g" \
+ -e "s|@MDATE@|`date +'%-d %B %Y' -r $(top_srcdir)/ChangeLog`|g" \
-e "s|@OLDFONTDIR@|$(oldfontdir)|g" \
-e "s|@PDFDOCDIR@|$(pdfdocdir)|g" \
-e "s|@SYSTEMMACRODIR@|$(systemtmacdir)|g" \
diff --git a/Makefile.am b/Makefile.am
index d18c49b8..f2ea648c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -914,7 +914,7 @@ SUFFIXES += .man
-e "s|[@]MAN1EXT[@]|$(man1ext)|g" \
-e "s|[@]MAN5EXT[@]|$(man5ext)|g" \
-e "s|[@]MAN7EXT[@]|$(man7ext)|g" \
- -e "s|[@]MDATE[@]|`$(PERL) $(top_srcdir)/mdate.pl $<`|g" \
+ -e "s|[@]MDATE[@]|`date +'%-d %B %Y' -r $(top_srcdir)/ChangeLog`|g" \
-e "s|[@]OLDFONTDIR[@]|`echo $(oldfontdir) | sed -f $(makevarescape)`|g" \
-e "s|[@]PDFDOCDIR[@]|`echo $(pdfdocdir) | sed -f $(makevarescape)`|g" \
-e "s|[@]SYSTEMMACRODIR[@]|`echo $(systemtmacdir) | sed -f $(makevarescape)`|g" \

0 comments on commit 3446e4c

Please sign in to comment.
You can’t perform that action at this time.