Merge pull request #120528 from marsam/update-goaccess

goaccess: 1.4 -> 1.4.6

authored by Mario Rodas and committed by GitHub 1fe6ed37 8bd0763d

+9 -18
+9 -18
pkgs/tools/misc/goaccess/default.nix
··· 1 - { lib, stdenv, fetchurl, pkg-config, ncurses, glib, libmaxminddb, fetchpatch }: 1 + { lib, stdenv, fetchurl, ncurses, gettext, openssl, withGeolocation ? true, libmaxminddb }: 2 2 3 3 stdenv.mkDerivation rec { 4 - version = "1.4"; 4 + version = "1.4.6"; 5 5 pname = "goaccess"; 6 6 7 7 src = fetchurl { 8 8 url = "https://tar.goaccess.io/goaccess-${version}.tar.gz"; 9 - sha256 = "1gkpjg39f3afdwm9128jqjsfap07p8s027czzlnxfmi5hpzvkyz8"; 9 + sha256 = "1l3j3i4vb7ni7i047qvi9a3hs43ym24r6hfcnqsbhgrb731jf3qx"; 10 10 }; 11 11 12 - patches = [ 13 - (fetchpatch { 14 - url = "https://github.com/allinurl/goaccess/commit/514618cdd69453497fbf67913ccb37a0a0b07391.patch"; 15 - sha256 = "11lp7mabfl6ibgzsd9nw10k2xvcm0hrimrwidl06r8dqn2jzjxf6"; 16 - }) 17 - ]; 18 - 19 12 configureFlags = [ 20 - "--enable-geoip=mmdb" 21 13 "--enable-utf8" 22 - ]; 14 + "--with-openssl" 15 + ] ++ lib.optionals withGeolocation [ "--enable-geoip=mmdb" ]; 23 16 24 - nativeBuildInputs = [ pkg-config ]; 25 - buildInputs = [ 26 - libmaxminddb 27 - ncurses 28 - glib 29 - ]; 17 + buildInputs = [ ncurses openssl ] 18 + ++ lib.optionals withGeolocation [ libmaxminddb ] 19 + ++ lib.optionals stdenv.isDarwin [ gettext ]; 30 20 31 21 meta = { 32 22 description = "Real-time web log analyzer and interactive viewer that runs in a terminal in *nix systems"; 33 23 homepage = "https://goaccess.io"; 24 + changelog = "https://github.com/allinurl/goaccess/raw/v${version}/ChangeLog"; 34 25 license = lib.licenses.mit; 35 26 platforms = lib.platforms.linux ++ lib.platforms.darwin; 36 27 maintainers = with lib.maintainers; [ ederoyd46 ];