diff --git a/pkgs/by-name/yt/ytree/0001-use-prefix-and-gzip-n.diff b/pkgs/by-name/yt/ytree/0001-use-prefix-and-gzip-n.diff index 7a682ce7e4c6..977eaa538302 100644 --- a/pkgs/by-name/yt/ytree/0001-use-prefix-and-gzip-n.diff +++ b/pkgs/by-name/yt/ytree/0001-use-prefix-and-gzip-n.diff @@ -4,36 +4,26 @@ diff -Naur ytree-2.06-old/Makefile ytree-2.06-new/Makefile @@ -11,13 +11,13 @@ # ADD_CFLAGS: Add -DVI_KEYS if you want vi-cursor-keys # - + -DESTDIR = /usr +PREFIX = /usr - - ADD_CFLAGS = -O # -DVI_KEYS - + + ADD_CFLAGS = # -DVI_KEYS + -BINDIR = $(DESTDIR)/bin -MANDIR = $(DESTDIR)/share/man/man1 -MANESDIR = $(DESTDIR)/share/man/es/man1 +BINDIR = $(DESTDIR)$(PREFIX)/bin +MANDIR = $(DESTDIR)$(PREFIX)/share/man/man1 +MANESDIR = $(DESTDIR)$(PREFIX)/share/man/es/man1 - - + + # Uncomment the lines for your system (default is linux) -@@ -224,14 +224,14 @@ - +@@ -221,7 +221,7 @@ install: $(MAIN) + if [ ! -e $(BINDIR) ]; then mkdir -p $(BINDIR); fi install $(MAIN) $(BINDIR) - gzip -9c ytree.1 > ytree.1.gz + gzip -n -9c ytree.1 > ytree.1.gz - if [ -d $(MANDIR) ]; then install -m 0644 ytree.1.gz $(MANDIR)/; fi -- gzip -9c ytree.1.es > ytree.1.es.gz -+ gzip -n -9c ytree.1.es > ytree.1.es.gz - if [ -d $(MANESDIR) ]; then install -m 0644 ytree.1.es.gz $(MANESDIR)/; fi - - clean: - rm -f core *.o *~ *.orig *.bak -- -+ - clobber: clean - rm -f $(MAIN) ytree.1.es.gz ytree.1.gz - + if [ ! -e $(MANDIR) ]; then mkdir -p $(MANDIR); fi + install -m 0644 ytree.1.gz $(MANDIR)/ diff --git a/pkgs/by-name/yt/ytree/package.nix b/pkgs/by-name/yt/ytree/package.nix index 491ac76e1bae..4981cef6f9c5 100644 --- a/pkgs/by-name/yt/ytree/package.nix +++ b/pkgs/by-name/yt/ytree/package.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "ytree"; - version = "2.06"; + version = "2.10"; src = fetchurl { url = "https://han.de/~werner/ytree-${finalAttrs.version}.tar.gz"; - hash = "sha256-QRqI779ZnnytVUC7A7Zt0zyWexRwBnp+CVQcNvnvWeY="; + hash = "sha256-O7u9MvVoza4+A/xzWxeD2MumBaLKYFbRuXEUPX3dUX0="; }; patches = [