git.iko.soy/typeable/nixpkgs
on master help sign in
lnav: 0.9.0 -> 0.10.0

ChangeLog: https://github.com/tstack/lnav/releases/tag/v0.10.0

commit562749f486aedf747e3ff5c6e685b5f224cf8234 authorMaximilian Bosch <maximilian@mbosch.me> dateFri 6 Aug 2021, 11:06 (5 years ago) parentf48eda6
2 files changed+49−8
compare with master
unifiedsplit
pkgs/tools/misc/lnav/0001-Forcefully-disable-docs-build.patch+38 pkgs/tools/misc/lnav/default.nix+11−8
pkgs/tools/misc/lnav/0001-Forcefully-disable-docs-build.patchnew file+38
@@ -0,0 +1,38 @@
1+From 20c3fe76340981c43eeed16a5509480a0f5cb56d Mon Sep 17 00:00:00 2001
2+From: Maximilian Bosch <maximilian@mbosch.me>
3+Date: Fri, 6 Aug 2021 10:55:01 +0200
4+Subject: [PATCH] Forcefully disable docs build
5+
6+This currently affects the following statement in `src/Makefile.am`
7+only:
8+
9+ if !DISABLE_DOCUMENTATION
10+ all-local: lnav
11+ if test -w $(srcdir)/internals; then \
12+ env DUMP_INTERNALS_DIR=$(srcdir)/internals DUMP_CRASH=1 ./lnav Makefile; \
13+ mv $(srcdir)/internals/*.schema.json $(top_srcdir)/docs/schemas; \
14+ fi
15+ endif
16+
17+We cannot do this (even on non-cross builds) since `lnav` requires e.g.
18+`/etc/nsswitch.conf` and other impurities here.
19+---
20+ configure.ac | 2 +-
21+ 1 file changed, 1 insertion(+), 1 deletion(-)
22+
23+diff --git a/configure.ac b/configure.ac
24+index ce311fd8..e3c9ebe0 100644
25+--- a/configure.ac
26++++ b/configure.ac
27+@@ -287,7 +287,7 @@ AS_IF([test $? -eq 0],
28+
29+ AM_CONDITIONAL(USE_INCLUDED_YAJL, test $HAVE_LOCAL_YAJL -eq 0)
30+ AM_CONDITIONAL(HAVE_LIBCURL, test x"$LIBCURL" != x"")
31+-AM_CONDITIONAL([DISABLE_DOCUMENTATION], [ test x"$cross_compiling" != x"no" ])
32++AM_CONDITIONAL([DISABLE_DOCUMENTATION], [ true ])
33+
34+ AC_CONFIG_HEADERS([src/config.h])
35+ AC_CONFIG_FILES([Makefile])
36+--
37+2.31.1
38+
pkgs/tools/misc/lnav/default.nix+11−8
@@ -3,18 +3,25 @@
33
44stdenv.mkDerivation rec {
55 pname = "lnav";
6− version = "0.9.0";
6+ version = "0.10.0";
77
88 src = fetchFromGitHub {
99 owner = "tstack";
1010 repo = "lnav";
1111 rev = "v${version}";
12− sha256 = "1frdrr3yjlk2fns3ny0qbr30rpswhwlvv3kyhdl3l6a0q5cqaqsg";
12+ sha256 = "sha256-hAFyMypGC065aRgX2L4LdyFGpZ/LnX5SjA2iQv5Iuas=";
1313 };
1414
15+ patches = [ ./0001-Forcefully-disable-docs-build.patch ];
16+ postPatch = ''
17+ substituteInPlace Makefile.am \
18+ --replace "SUBDIRS = src test" "SUBDIRS = src"
19+ '';
20+
21+ enableParallelBuilding = true;
22+
23+ nativeBuildInputs = [ autoconf automake ];
1524 buildInputs = [
16− autoconf
17− automake
1825 zlib
1926 bzip2
2027 ncurses
@@ -24,10 +31,6 @@ stdenv.mkDerivation rec {
2431 curl
2532 ];
2633
27− postPatch = ''
28− sed -ie '/DUMP_INTERNALS/d' src/Makefile.am
29− '';
30−
3134 preConfigure = ''
3235 ./autogen.sh
3336 '';