public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
Frederik Rietdijk
2018-11-18 10:41:34 +01:00
parent 0a085d508a 3aa6b8ccc5
commit 0d0d7dcd06
422 changed files with 65253 additions and 65218 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/system/at/default.nix
+3 -3
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, fetchpatch, bison, flex, pam
{ stdenv, fetchurl, fetchpatch, bison, flex, pam, perl
, sendmailPath ? "/run/wrappers/bin/sendmail"
, atWrapperPath ? "/run/wrappers/bin/at"
}:
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
})
];
nativeBuildInputs = [ bison flex ];
nativeBuildInputs = [ bison flex perl /* for `prove` (tests) */ ];
buildInputs = [ pam ];
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
"--with-daemon_groupname=atd"
];
doCheck = false; # need "prove" tool
doCheck = true;
# Ensure that "batch" can invoke the setuid "at" wrapper, if it exists, or
# else we get permission errors (on NixOS). "batch" is a shell script, so
pkgs/tools/system/bootchart/default.nix
+7 -5
View File
@@ -1,12 +1,14 @@
{stdenv, fetchurl, pkgconfig, glib, gtk2, python2Packages }:
{stdenv, fetchFromGitHub, pkgconfig, glib, gtk2, python2Packages }:
stdenv.mkDerivation rec {
version = "0.14.7";
version = "0.14.8";
name = "bootchart-${version}";
src = fetchurl {
url = "https://github.com/mmeeks/bootchart/archive/${version}.tar.gz";
sha256 = "1abn4amsyys6vwn7csxsxny94n24ycca3xhqxqcmdc4j0dzn3kmb";
src = fetchFromGitHub {
owner = "mmeeks";
repo = "bootchart";
rev = version;
sha256 = "12ja2hp6f49416zfjdx0kjfmlkh9wl9b7wz7gk372kps4gjnypqx";
};
nativeBuildInputs = [ pkgconfig ];
pkgs/tools/system/netdata/default.nix
+20 -17
View File
@@ -1,39 +1,42 @@
{ 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
patches = [
./no-files-in-etc-and-var.patch
];
postInstall = stdenv.lib.optionalString (!stdenv.isDarwin) ''
# rename this plugin so netdata will look for setuid wrapper
mv $out/libexec/netdata/plugins.d/apps.plugin \
$out/libexec/netdata/plugins.d/apps.plugin.org
'';
configureFlags = [
"--localstatedir=/var"
"--sysconfdir=/etc"
];
# 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 ];
};
pkgs/tools/system/netdata/no-files-in-etc-and-var.patch
+86
View File
@@ -0,0 +1,86 @@
diff -ruN orig/Makefile.am new/Makefile.am
--- orig/Makefile.am 2018-11-02 08:56:21.000000000 -0500
+++ new/Makefile.am 2018-11-16 10:30:22.000000000 -0500
@@ -99,10 +99,10 @@
$(NULL)
sbin_PROGRAMS =
-dist_cache_DATA = installer/.keep
-dist_varlib_DATA = installer/.keep
-dist_registry_DATA = installer/.keep
-dist_log_DATA = installer/.keep
+dist_cache_DATA =
+dist_varlib_DATA =
+dist_registry_DATA =
+dist_log_DATA =
plugins_PROGRAMS =
LIBNETDATA_FILES = \
diff -ruN orig/collectors/charts.d.plugin/Makefile.am new/collectors/charts.d.plugin/Makefile.am
--- orig/collectors/charts.d.plugin/Makefile.am 2018-11-02 08:56:21.000000000 -0500
+++ new/collectors/charts.d.plugin/Makefile.am 2018-11-16 11:16:47.000000000 -0500
@@ -32,7 +32,6 @@
userchartsconfigdir=$(configdir)/charts.d
dist_userchartsconfig_DATA = \
- $(top_srcdir)/installer/.keep \
$(NULL)
chartsconfigdir=$(libconfigdir)/charts.d
diff -ruN orig/collectors/node.d.plugin/Makefile.am new/collectors/node.d.plugin/Makefile.am
--- orig/collectors/node.d.plugin/Makefile.am 2018-11-02 08:56:21.000000000 -0500
+++ new/collectors/node.d.plugin/Makefile.am 2018-11-16 11:16:42.000000000 -0500
@@ -23,7 +23,6 @@
usernodeconfigdir=$(configdir)/node.d
dist_usernodeconfig_DATA = \
- $(top_srcdir)/installer/.keep \
$(NULL)
nodeconfigdir=$(libconfigdir)/node.d
diff -ruN orig/collectors/python.d.plugin/Makefile.am new/collectors/python.d.plugin/Makefile.am
--- orig/collectors/python.d.plugin/Makefile.am 2018-11-02 08:56:21.000000000 -0500
+++ new/collectors/python.d.plugin/Makefile.am 2018-11-16 10:56:06.000000000 -0500
@@ -29,7 +29,6 @@
userpythonconfigdir=$(configdir)/python.d
dist_userpythonconfig_DATA = \
- $(top_srcdir)/installer/.keep \
$(NULL)
pythonconfigdir=$(libconfigdir)/python.d
diff -ruN orig/collectors/statsd.plugin/Makefile.am new/collectors/statsd.plugin/Makefile.am
--- orig/collectors/statsd.plugin/Makefile.am 2018-11-02 08:56:21.000000000 -0500
+++ new/collectors/statsd.plugin/Makefile.am 2018-11-16 10:53:04.000000000 -0500
@@ -15,6 +15,5 @@
userstatsdconfigdir=$(configdir)/statsd.d
dist_userstatsdconfig_DATA = \
- $(top_srcdir)/installer/.keep \
$(NULL)
diff -ruN orig/health/Makefile.am new/health/Makefile.am
--- orig/health/Makefile.am 2018-11-02 08:56:21.000000000 -0500
+++ new/health/Makefile.am 2018-11-16 10:56:30.000000000 -0500
@@ -16,7 +16,6 @@
userhealthconfigdir=$(configdir)/health.d
dist_userhealthconfig_DATA = \
- $(top_srcdir)/installer/.keep \
$(NULL)
healthconfigdir=$(libconfigdir)/health.d
diff -ruN orig/system/Makefile.am new/system/Makefile.am
--- orig/system/Makefile.am 2018-11-02 08:56:21.000000000 -0500
+++ new/system/Makefile.am 2018-11-16 10:29:21.000000000 -0500
@@ -17,10 +17,6 @@
include $(top_srcdir)/build/subst.inc
SUFFIXES = .in
-dist_config_SCRIPTS = \
- edit-config \
- $(NULL)
-
nodist_noinst_DATA = \
netdata-openrc \
netdata.logrotate \
pkgs/tools/system/stress-ng/default.nix
+14 -7
View File
@@ -1,15 +1,21 @@
{ stdenv, fetchurl, attr, keyutils }:
{ stdenv, fetchurl
, attr, keyutils, libaio, libapparmor, libbsd, libcap, libgcrypt, lksctp-tools, zlib
}:
stdenv.mkDerivation rec {
name = "stress-ng-${version}";
version = "0.06.14";
version = "0.09.46";
src = fetchurl {
sha256 = "06kycxfwkdrm2vs9xk8cb6c1mki29ymrrqwwxxqx4icnwvq135hv";
url = "http://kernel.ubuntu.com/~cking/tarballs/stress-ng/${name}.tar.gz";
url = "http://kernel.ubuntu.com/~cking/tarballs/stress-ng/${name}.tar.xz";
sha256 = "0m1f46vqixx2mgqdrjwkl8w9did7n99sy96rbcgkkn9g99y59qjm";
};
buildInputs = [ attr keyutils ];
# All platforms inputs then Linux-only ones
buildInputs = [ libbsd libgcrypt zlib ]
++ stdenv.lib.optionals stdenv.hostPlatform.isLinux [
attr keyutils libaio libapparmor libcap lksctp-tools
];
patchPhase = ''
substituteInPlace Makefile --replace "/usr" ""
@@ -36,9 +42,10 @@ stdenv.mkDerivation rec {
hardware issues such as thermal overruns as well as operating system
bugs that only occur when a system is being thrashed hard.
'';
homepage = http://kernel.ubuntu.com/~cking/stress-ng;
homepage = http://kernel.ubuntu.com/~cking/stress-ng/;
downloadPage = http://kernel.ubuntu.com/~cking/tarballs/stress-ng/;
license = licenses.gpl2Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ c0bw3b ];
platforms = platforms.linux; # TODO: fix https://github.com/NixOS/nixpkgs/pull/50506#issuecomment-439635963
};
}