Merge pull request #148410 from fabaff/bump-goaccess

goaccess: 1.5.2 -> 1.5.3

authored by

Fabian Affolter and committed by
GitHub
83f90d92 e368b85a

+38 -16
+38 -16
pkgs/tools/misc/goaccess/default.nix
··· 1 - { lib, stdenv, fetchurl, ncurses, gettext, openssl, withGeolocation ? true, libmaxminddb }: 1 + { lib 2 + , stdenv 3 + , autoreconfHook 4 + , fetchFromGitHub 5 + , gettext 6 + , libmaxminddb 7 + , ncurses 8 + , openssl 9 + , withGeolocation ? true 10 + }: 2 11 3 12 stdenv.mkDerivation rec { 4 - version = "1.5.2"; 13 + version = "1.5.3"; 5 14 pname = "goaccess"; 6 15 7 - src = fetchurl { 8 - url = "https://tar.goaccess.io/goaccess-${version}.tar.gz"; 9 - sha256 = "sha256-oM4vk5OyYiSE5GnpWoCd/VKt5NQgBJHkPt4fy1KrHIo="; 16 + src = fetchFromGitHub { 17 + owner = "allinurl"; 18 + repo = pname; 19 + rev = "v${version}"; 20 + sha256 = "sha256-TgreyBlV86K6P0W9WeLUW6RbcHpuOFW2fj2cCe7nWHE="; 10 21 }; 11 22 23 + nativeBuildInputs = [ 24 + autoreconfHook 25 + ]; 26 + 27 + buildInputs = [ 28 + ncurses 29 + openssl 30 + ] ++ lib.optionals withGeolocation [ 31 + libmaxminddb 32 + ] ++ lib.optionals stdenv.isDarwin [ 33 + gettext 34 + ]; 35 + 12 36 configureFlags = [ 13 37 "--enable-utf8" 14 38 "--with-openssl" 15 - ] ++ lib.optionals withGeolocation [ "--enable-geoip=mmdb" ]; 39 + ] ++ lib.optionals withGeolocation [ 40 + "--enable-geoip=mmdb" 41 + ]; 16 42 17 - buildInputs = [ ncurses openssl ] 18 - ++ lib.optionals withGeolocation [ libmaxminddb ] 19 - ++ lib.optionals stdenv.isDarwin [ gettext ]; 20 - 21 - meta = { 43 + meta = with lib; { 22 44 description = "Real-time web log analyzer and interactive viewer that runs in a terminal in *nix systems"; 23 - homepage = "https://goaccess.io"; 24 - changelog = "https://github.com/allinurl/goaccess/raw/v${version}/ChangeLog"; 25 - license = lib.licenses.mit; 26 - platforms = lib.platforms.linux ++ lib.platforms.darwin; 27 - maintainers = with lib.maintainers; [ ederoyd46 ]; 45 + homepage = "https://goaccess.io"; 46 + changelog = "https://github.com/allinurl/goaccess/raw/v${version}/ChangeLog"; 47 + license = licenses.mit; 48 + maintainers = with maintainers; [ ederoyd46 ]; 49 + platforms = platforms.linux ++ platforms.darwin; 28 50 }; 29 51 }