Merging against master - updating smokingpig, rebase was going to be messy
This commit is contained in:
Parnell Springmeyer
@@ -1,4 +1,4 @@
|
||||
{stdenv, fetchurl, lib, pkgconfig, glib, gtk2, python27, pythonPackages }:
|
||||
{stdenv, fetchurl, lib, pkgconfig, glib, gtk2, python27, python2Packages }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.14.7";
|
||||
@@ -9,11 +9,11 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "1abn4amsyys6vwn7csxsxny94n24ycca3xhqxqcmdc4j0dzn3kmb";
|
||||
};
|
||||
|
||||
buildInputs = [ pkgconfig glib gtk2 python27 pythonPackages.wrapPython pythonPackages.pygtk ];
|
||||
pythonPath = with pythonPackages; [ pygtk pycairo ];
|
||||
buildInputs = [ pkgconfig glib gtk2 python2Packages.python python2Packages.wrapPython python2Packages.pygtk ];
|
||||
pythonPath = with python2Packages; [ pygtk pycairo ];
|
||||
|
||||
installPhase = ''
|
||||
make install DESTDIR=$out BINDIR=/bin PY_LIBDIR=/lib/python2.7
|
||||
make install DESTDIR=$out BINDIR=/bin PY_LIBDIR=/lib/${python2Packages.python.libPrefix}
|
||||
wrapProgram $out/bin/pybootchartgui \
|
||||
--prefix PYTHONPATH : "$PYTHONPATH:$(toPythonPath $out)"
|
||||
'';
|
||||
|
||||
@@ -9,6 +9,7 @@
|
||||
, libdbi ? null
|
||||
, libgcrypt ? null
|
||||
, libmemcached ? null, cyrus_sasl ? null
|
||||
, libmicrohttpd ? null
|
||||
, libmodbus ? null
|
||||
, libnotify ? null, gdk_pixbuf ? null
|
||||
, liboping ? null
|
||||
@@ -34,24 +35,19 @@
|
||||
, libmnl ? null
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
version = "5.6.0";
|
||||
version = "5.7.0";
|
||||
name = "collectd-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://collectd.org/files/${name}.tar.bz2";
|
||||
sha256 = "08w6fjzczi2psk7va0xkjh9pigpar6sbjx2a6ayq4dmc3zcvpzzh";
|
||||
sha256 = "1cpjkv4d0iifngihxikzljavya0r2k3blarlahamgbdsqsymz815";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
pkgconfig curl iptables libatasmart libcredis libdbi libgcrypt libmemcached
|
||||
cyrus_sasl libmodbus libnotify gdk_pixbuf liboping libpcap libsigrok libvirt
|
||||
lm_sensors libxml2 lvm2 libmysql postgresql protobufc rabbitmq-c rrdtool
|
||||
varnish yajl jdk libtool python udev net_snmp hiredis libmnl
|
||||
];
|
||||
|
||||
patches = [
|
||||
# Replace deprecated readdir_r() with readdir() to avoid a fatal warning.
|
||||
./readdir-fix.patch
|
||||
varnish yajl jdk libtool python udev net_snmp hiredis libmnl libmicrohttpd
|
||||
];
|
||||
|
||||
# for some reason libsigrok isn't auto-detected
|
||||
|
||||
@@ -1,55 +0,0 @@
|
||||
diff -Naur collectd-5.6.0/src/vserver.c collectd-5.6.0/src/vserver.c
|
||||
--- collectd-5.6.0/src/vserver.c 2016-09-11 01:10:25.279038699 -0700
|
||||
+++ collectd-5.6.0/src/vserver.c 2016-09-25 07:44:40.771177458 -0700
|
||||
@@ -132,15 +132,8 @@
|
||||
|
||||
static int vserver_read (void)
|
||||
{
|
||||
-#if NAME_MAX < 1024
|
||||
-# define DIRENT_BUFFER_SIZE (sizeof (struct dirent) + 1024 + 1)
|
||||
-#else
|
||||
-# define DIRENT_BUFFER_SIZE (sizeof (struct dirent) + NAME_MAX + 1)
|
||||
-#endif
|
||||
-
|
||||
DIR *proc;
|
||||
struct dirent *dent; /* 42 */
|
||||
- char dirent_buffer[DIRENT_BUFFER_SIZE];
|
||||
|
||||
errno = 0;
|
||||
proc = opendir (PROCDIR);
|
||||
@@ -165,19 +158,23 @@
|
||||
|
||||
int status;
|
||||
|
||||
- status = readdir_r (proc, (struct dirent *) dirent_buffer, &dent);
|
||||
- if (status != 0)
|
||||
- {
|
||||
- char errbuf[4096];
|
||||
- ERROR ("vserver plugin: readdir_r failed: %s",
|
||||
- sstrerror (errno, errbuf, sizeof (errbuf)));
|
||||
- closedir (proc);
|
||||
- return (-1);
|
||||
- }
|
||||
- else if (dent == NULL)
|
||||
+ errno = 0;
|
||||
+ dent = readdir (proc);
|
||||
+ if (dent == NULL)
|
||||
{
|
||||
- /* end of directory */
|
||||
- break;
|
||||
+ if (errno != 0)
|
||||
+ {
|
||||
+ char errbuf[4096];
|
||||
+ ERROR ("vserver plugin: readdir failed: %s",
|
||||
+ sstrerror (errno, errbuf, sizeof (errbuf)));
|
||||
+ closedir (proc);
|
||||
+ return (-1);
|
||||
+ }
|
||||
+ else
|
||||
+ {
|
||||
+ /* end of directory */
|
||||
+ break;
|
||||
+ }
|
||||
}
|
||||
|
||||
if (dent->d_name[0] == '.')
|
||||
@@ -1,11 +1,13 @@
|
||||
{ stdenv, fetchurl, boost, cmake, cpp-hocon, curl, leatherman, libyamlcpp, openssl, ruby, utillinux }:
|
||||
{ stdenv, fetchFromGitHub, boost, cmake, cpp-hocon, curl, leatherman, libyamlcpp, openssl, ruby, utillinux }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "facter-${version}";
|
||||
version = "3.4.1";
|
||||
src = fetchurl {
|
||||
url = "https://downloads.puppetlabs.com/facter/${name}.tar.gz";
|
||||
sha256 = "1vvvqni68l3hmnxi8jp0n2rwzxyh1vmgv6xa2954h94dfax6dmcj";
|
||||
version = "3.5.1";
|
||||
src = fetchFromGitHub {
|
||||
sha256 = "1rhfww0knjh6bj3b0ykxgfgw6rg2bzibkdrisq3nhl3djfq7r1a8";
|
||||
rev = version;
|
||||
repo = "facter";
|
||||
owner = "puppetlabs";
|
||||
};
|
||||
|
||||
cmakeFlags = [ "-DFACTER_RUBY=${ruby}/lib/libruby.so" ];
|
||||
|
||||
@@ -0,0 +1,34 @@
|
||||
{ lib, pkgs, buildGoPackage, fetchFromGitHub, makeWrapper }:
|
||||
|
||||
let
|
||||
|
||||
libPath = lib.makeLibraryPath [ pkgs.systemd.lib ];
|
||||
|
||||
in buildGoPackage rec {
|
||||
|
||||
name = "journalbeat-${version}";
|
||||
version = "5.1.2";
|
||||
|
||||
goPackagePath = "github.com/mheese/journalbeat";
|
||||
|
||||
buildInputs = [ makeWrapper pkgs.systemd ];
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $bin/bin/journalbeat \
|
||||
--prefix LD_LIBRARY_PATH : ${libPath}
|
||||
'';
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mheese";
|
||||
repo = "journalbeat";
|
||||
rev = "v${version}";
|
||||
sha256 = "179jayzvd5k4mwhn73yflbzl5md1fmv7a9hb8vz2ir76lvr33g3l";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
homepage = https://github.com/mheese/journalbeat;
|
||||
description = "Journalbeat is a log shipper from systemd/journald to Logstash/Elasticsearch";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ mbrgm ];
|
||||
};
|
||||
}
|
||||
@@ -1,14 +1,14 @@
|
||||
{ stdenv, fetchFromGitHub, autoreconfHook, zlib, pkgconfig, libuuid }:
|
||||
|
||||
stdenv.mkDerivation rec{
|
||||
version = "1.4.0";
|
||||
version = "1.5.0";
|
||||
name = "netdata-${version}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
rev = "v${version}";
|
||||
owner = "firehol";
|
||||
repo = "netdata";
|
||||
sha256 = "1wknxci2baj6f7rl8z8j7haaz122jmbb74aw7i3xbj2y61cs58n8";
|
||||
sha256 = "1nsv0s11ai1kvig9xr4cz2f2lalvilpbfjpd8fdfqk9fak690zhz";
|
||||
};
|
||||
|
||||
buildInputs = [ autoreconfHook zlib pkgconfig libuuid ];
|
||||
|
||||
@@ -0,0 +1,28 @@
|
||||
{ stdenv, fetchFromGitHub, opencl-clhpp, ocl-icd }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "opencl-info-2014-02-21";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "marchv";
|
||||
repo = "opencl-info";
|
||||
rev = "3e53d001a98978feb865650cf0e93b045400c0d7";
|
||||
sha256 = "114lxgnjg40ivjjszkv4n3f3yq2lbrvywryvbazf20kqmdz7315l";
|
||||
};
|
||||
|
||||
buildInputs = [ opencl-clhpp ocl-icd ];
|
||||
|
||||
NIX_LDFLAGS = [ "-lOpenCL" ];
|
||||
|
||||
installPhase = ''
|
||||
install -Dm755 opencl-info $out/bin/opencl-info
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "A tool to dump OpenCL platform/device information";
|
||||
homepage = "https://github.com/marchv/opencl-info";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ abbradar ];
|
||||
};
|
||||
}
|
||||
@@ -8,9 +8,7 @@ stdenv.mkDerivation rec {
|
||||
env = bundlerEnv {
|
||||
name = "${name}-gems";
|
||||
|
||||
gemfile = ./Gemfile;
|
||||
lockfile = ./Gemfile.lock;
|
||||
gemset = ./gemset.nix;
|
||||
gemdir = ./.;
|
||||
inherit ruby;
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user