ytree: 2.06 -> 2.10 (#414123)

Changed files
+12 -22
pkgs
+10 -20
pkgs/by-name/yt/ytree/0001-use-prefix-and-gzip-n.diff
···
@@ -11,13 +11,13 @@
# ADD_CFLAGS: Add -DVI_KEYS if you want vi-cursor-keys
#
-
-DESTDIR = /usr
+PREFIX = /usr
-
-
ADD_CFLAGS = -O # -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 @@
-
install: $(MAIN)
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
-
···
@@ -11,13 +11,13 @@
# ADD_CFLAGS: Add -DVI_KEYS if you want vi-cursor-keys
#
+
-DESTDIR = /usr
+PREFIX = /usr
+
+
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)
+
@@ -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 [ ! -e $(MANDIR) ]; then mkdir -p $(MANDIR); fi
+
install -m 0644 ytree.1.gz $(MANDIR)/
+2 -2
pkgs/by-name/yt/ytree/package.nix
···
stdenv.mkDerivation (finalAttrs: {
pname = "ytree";
-
version = "2.06";
src = fetchurl {
url = "https://han.de/~werner/ytree-${finalAttrs.version}.tar.gz";
-
hash = "sha256-QRqI779ZnnytVUC7A7Zt0zyWexRwBnp+CVQcNvnvWeY=";
};
patches = [
···
stdenv.mkDerivation (finalAttrs: {
pname = "ytree";
+
version = "2.10";
src = fetchurl {
url = "https://han.de/~werner/ytree-${finalAttrs.version}.tar.gz";
+
hash = "sha256-O7u9MvVoza4+A/xzWxeD2MumBaLKYFbRuXEUPX3dUX0=";
};
patches = [