alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

netdata: 1.10.0 -> 1.11.0

Browse source
This commit is contained in:
Mario Rodas 2018-11-14 11:01:41 -05:00
parent d59307e54c
commit 49ac683e70
2 changed files with 15 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
pkgs/tools/system/netdata/default.nix
View file

@ -1,39 +1,36 @@
{ stdenv, fetchFromGitHub, autoreconfHook, zlib, pkgconfig, libuuid }: { stdenv, fetchurl, autoreconfHook, pkgconfig, zlib, libuuid, libossp_uuid, CoreFoundation, IOKit }:
stdenv.mkDerivation rec{ stdenv.mkDerivation rec{
version = "1.10.0"; version = "1.11.0";
name = "netdata-${version}"; name = "netdata-${version}";
src = fetchFromGitHub { src = fetchurl {
rev = "v${version}"; url = "https://github.com/netdata/netdata/releases/download/v${version}/netdata-v${version}.tar.gz";
owner = "firehol"; sha256 = "17b14w34jif6bviw3s81imbazkvvafwxff7d5zjy6wicq88q8b64";
repo = "netdata";
sha256 = "02spfisabjkkgd9fairldlf84n83vbv2xafg0g5jrpfa972pjl9r";
}; };
nativeBuildInputs = [ autoreconfHook pkgconfig ]; 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 # Build will fail trying to create /var/{cache,lib,log}/netdata without this
postPatch = '' postPatch = ''
sed -i '/dist_.*_DATA = \.keep/d' src/Makefile.am substituteInPlace Makefile.am --replace "installer/.keep" ""
''; '';
configureFlags = [ configureFlags = [
"--localstatedir=/var" "--localstatedir=/var"
]; ];
# App fails on runtime if the default config file is not detected postFixup = ''
# The upstream installer does prepare an empty file too rm -r $out/sbin
postInstall = ''
touch $out/etc/netdata/netdata.conf
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Real-time performance monitoring tool"; description = "Real-time performance monitoring tool";
homepage = http://netdata.firehol.org; homepage = https://my-netdata.io/;
license = licenses.gpl3; license = licenses.gpl3;
platforms = platforms.linux; platforms = platforms.unix;
maintainers = [ maintainers.lethalman ]; maintainers = [ maintainers.lethalman ];
}; };

4
pkgs/top-level/all-packages.nix
View file

@ -3766,7 +3766,9 @@ with pkgs;
pythonPackages = python3Packages; 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 { netsurf = recurseIntoAttrs (let callPackage = newScope pkgs.netsurf; in rec {
# ui could be gtk, sixel or framebuffer. Note that console display (sixel) # ui could be gtk, sixel or framebuffer. Note that console display (sixel)