diff options
| author | Alyssa Ross <hi@alyssa.is> | 2022-01-03 23:55:00 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2022-02-19 11:03:39 +0000 |
| commit | f4cf97a04cd5d0b86aa46baec9fb228a8f671c03 (patch) | |
| tree | 28192415ff39a661d0001563bf81cc93fa25d16d /nixpkgs/pkgs/tools/misc/goaccess | |
| parent | f8422837c9bde058e8f2de37702e7e94b2226040 (diff) | |
| parent | 18c84ea816348e2a098390101b92d1e39a9dbd45 (diff) | |
| download | nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.gz nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.bz2 nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.lz nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.xz nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.zst nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.zip | |
Merge commit '18c84ea816348e2a098390101b92d1e39a9dbd45'
Conflicts: nixpkgs/nixos/modules/misc/documentation.nix nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix nixpkgs/pkgs/applications/window-managers/sway/default.nix nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix nixpkgs/pkgs/development/go-modules/generic/default.nix nixpkgs/pkgs/development/interpreters/ruby/default.nix nixpkgs/pkgs/development/interpreters/ruby/patchsets.nix nixpkgs/pkgs/development/libraries/boehm-gc/7.6.6.nix nixpkgs/pkgs/development/python-modules/django-mailman3/default.nix nixpkgs/pkgs/servers/mail/mailman/web.nix nixpkgs/pkgs/top-level/aliases.nix nixpkgs/pkgs/top-level/all-packages.nix nixpkgs/pkgs/top-level/impure.nix
Diffstat (limited to 'nixpkgs/pkgs/tools/misc/goaccess')
| -rw-r--r-- | nixpkgs/pkgs/tools/misc/goaccess/default.nix | 54 |
1 files changed, 38 insertions, 16 deletions
diff --git a/nixpkgs/pkgs/tools/misc/goaccess/default.nix b/nixpkgs/pkgs/tools/misc/goaccess/default.nix index 008c9b59397f..fd1c80a35a09 100644 --- a/nixpkgs/pkgs/tools/misc/goaccess/default.nix +++ b/nixpkgs/pkgs/tools/misc/goaccess/default.nix @@ -1,29 +1,51 @@ -{ lib, stdenv, fetchurl, ncurses, gettext, openssl, withGeolocation ? true, libmaxminddb }: +{ lib +, stdenv +, autoreconfHook +, fetchFromGitHub +, gettext +, libmaxminddb +, ncurses +, openssl +, withGeolocation ? true +}: stdenv.mkDerivation rec { - version = "1.5.2"; + version = "1.5.4"; pname = "goaccess"; - src = fetchurl { - url = "https://tar.goaccess.io/goaccess-${version}.tar.gz"; - sha256 = "sha256-oM4vk5OyYiSE5GnpWoCd/VKt5NQgBJHkPt4fy1KrHIo="; + src = fetchFromGitHub { + owner = "allinurl"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-KDA5R3up37DLS9YIur4IOacwOq0zed5tj58jEmE0vpE="; }; + nativeBuildInputs = [ + autoreconfHook + ]; + + buildInputs = [ + ncurses + openssl + ] ++ lib.optionals withGeolocation [ + libmaxminddb + ] ++ lib.optionals stdenv.isDarwin [ + gettext + ]; + configureFlags = [ "--enable-utf8" "--with-openssl" - ] ++ lib.optionals withGeolocation [ "--enable-geoip=mmdb" ]; - - buildInputs = [ ncurses openssl ] - ++ lib.optionals withGeolocation [ libmaxminddb ] - ++ lib.optionals stdenv.isDarwin [ gettext ]; + ] ++ lib.optionals withGeolocation [ + "--enable-geoip=mmdb" + ]; - meta = { + meta = with lib; { description = "Real-time web log analyzer and interactive viewer that runs in a terminal in *nix systems"; - homepage = "https://goaccess.io"; - changelog = "https://github.com/allinurl/goaccess/raw/v${version}/ChangeLog"; - license = lib.licenses.mit; - platforms = lib.platforms.linux ++ lib.platforms.darwin; - maintainers = with lib.maintainers; [ ederoyd46 ]; + homepage = "https://goaccess.io"; + changelog = "https://github.com/allinurl/goaccess/raw/v${version}/ChangeLog"; + license = licenses.mit; + maintainers = with maintainers; [ ederoyd46 ]; + platforms = platforms.linux ++ platforms.darwin; }; } |