From 49ac683e70a11caa2702572619fa3c394346e572 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 14 Nov 2018 11:01:41 -0500 Subject: [PATCH] netdata: 1.10.0 -> 1.11.0 --- pkgs/tools/system/netdata/default.nix | 27 ++++++++++++--------------- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 15 insertions(+), 16 deletions(-) diff --git a/pkgs/tools/system/netdata/default.nix b/pkgs/tools/system/netdata/default.nix index 6f86647f4c70..ccbc11d212ae 100644 --- a/pkgs/tools/system/netdata/default.nix +++ b/pkgs/tools/system/netdata/default.nix @@ -1,39 +1,36 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, zlib, pkgconfig, libuuid }: +{ stdenv, fetchurl, autoreconfHook, pkgconfig, zlib, libuuid, libossp_uuid, CoreFoundation, IOKit }: stdenv.mkDerivation rec{ - version = "1.10.0"; + version = "1.11.0"; name = "netdata-${version}"; - src = fetchFromGitHub { - rev = "v${version}"; - owner = "firehol"; - repo = "netdata"; - sha256 = "02spfisabjkkgd9fairldlf84n83vbv2xafg0g5jrpfa972pjl9r"; + src = fetchurl { + url = "https://github.com/netdata/netdata/releases/download/v${version}/netdata-v${version}.tar.gz"; + sha256 = "17b14w34jif6bviw3s81imbazkvvafwxff7d5zjy6wicq88q8b64"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; - buildInputs = [ zlib libuuid ]; + buildInputs = [ zlib ] + ++ (if stdenv.isDarwin then [ libossp_uuid CoreFoundation IOKit ] else [ libuuid ]); # Build will fail trying to create /var/{cache,lib,log}/netdata without this postPatch = '' - sed -i '/dist_.*_DATA = \.keep/d' src/Makefile.am + substituteInPlace Makefile.am --replace "installer/.keep" "" ''; configureFlags = [ "--localstatedir=/var" ]; - # App fails on runtime if the default config file is not detected - # The upstream installer does prepare an empty file too - postInstall = '' - touch $out/etc/netdata/netdata.conf + postFixup = '' + rm -r $out/sbin ''; meta = with stdenv.lib; { description = "Real-time performance monitoring tool"; - homepage = http://netdata.firehol.org; + homepage = https://my-netdata.io/; license = licenses.gpl3; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = [ maintainers.lethalman ]; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index be30a885759a..ffed6229b6cc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3766,7 +3766,9 @@ with pkgs; pythonPackages = python3Packages; }; - netdata = callPackage ../tools/system/netdata { }; + netdata = callPackage ../tools/system/netdata { + inherit (darwin.apple_sdk.frameworks) CoreFoundation IOKit; + }; netsurf = recurseIntoAttrs (let callPackage = newScope pkgs.netsurf; in rec { # ui could be gtk, sixel or framebuffer. Note that console display (sixel)