diff options
Diffstat (limited to 'pkgs/tools/system')
-rw-r--r-- | pkgs/tools/system/efibootmgr/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/system/fio/default.nix | 27 | ||||
-rw-r--r-- | pkgs/tools/system/ipmiutil/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/system/logrotate/default.nix | 11 | ||||
-rw-r--r-- | pkgs/tools/system/netdata/default.nix | 7 | ||||
-rw-r--r-- | pkgs/tools/system/netdata/web_access.patch | 20 | ||||
-rw-r--r-- | pkgs/tools/system/nvtop/default.nix | 30 | ||||
-rw-r--r-- | pkgs/tools/system/osquery/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/system/rsyslog/default.nix | 10 |
9 files changed, 66 insertions, 49 deletions
diff --git a/pkgs/tools/system/efibootmgr/default.nix b/pkgs/tools/system/efibootmgr/default.nix index fbce70e9e8e..f23345fb71d 100644 --- a/pkgs/tools/system/efibootmgr/default.nix +++ b/pkgs/tools/system/efibootmgr/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "efibootmgr-${version}"; - version = "16"; + version = "17"; nativeBuildInputs = [ pkgconfig ]; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { owner = "rhboot"; repo = "efibootmgr"; rev = version; - sha256 = "0b27h8vf1b6laln5n0wk2hkzyyh87sxanj7wrz9kimyx03dcq6vi"; + sha256 = "1niicijxg59rsmiw3rsjwy4bvi1n42dynvm01lnp9haixdzdpq03"; }; makeFlags = [ "EFIDIR=nixos" ]; diff --git a/pkgs/tools/system/fio/default.nix b/pkgs/tools/system/fio/default.nix index 2a5eea0b251..261f4cee2b8 100644 --- a/pkgs/tools/system/fio/default.nix +++ b/pkgs/tools/system/fio/default.nix @@ -1,23 +1,23 @@ -{ stdenv, fetchFromGitHub, libaio, python, zlib }: - -let - version = "3.7"; - sha256 = "1m2slyxhzyznq283m6ljjgjg38i0hxg537bwhfs12qskv00c4vsk"; -in +{ stdenv, fetchFromGitHub, makeWrapper +, libaio, python, zlib +, withGnuplot ? false, gnuplot ? null }: stdenv.mkDerivation rec { name = "fio-${version}"; + version = "3.8"; src = fetchFromGitHub { - owner = "axboe"; - repo = "fio"; - rev = "fio-${version}"; - inherit sha256; + owner = "axboe"; + repo = "fio"; + rev = "fio-${version}"; + sha256 = "1krifr4ms7x229a3p088zl5rpdrfwz6bw4c2lrz3hksignjxaw91"; }; buildInputs = [ python zlib ] ++ stdenv.lib.optional (!stdenv.isDarwin) libaio; + nativeBuildInputs = [ makeWrapper ]; + enableParallelBuilding = true; postPatch = '' @@ -27,9 +27,14 @@ stdenv.mkDerivation rec { substituteInPlace tools/plot/fio2gnuplot --replace /usr/share/fio $out/share/fio ''; + postInstall = stdenv.lib.optionalString withGnuplot '' + wrapProgram $out/bin/fio2gnuplot \ + --prefix PATH : ${stdenv.lib.makeBinPath [ gnuplot ]} + ''; + meta = with stdenv.lib; { - homepage = "http://git.kernel.dk/?p=fio.git;a=summary;"; description = "Flexible IO Tester - an IO benchmark tool"; + homepage = "http://git.kernel.dk/?p=fio.git;a=summary;"; license = licenses.gpl2; platforms = platforms.unix; }; diff --git a/pkgs/tools/system/ipmiutil/default.nix b/pkgs/tools/system/ipmiutil/default.nix index f3bd820e3e8..cd657769489 100644 --- a/pkgs/tools/system/ipmiutil/default.nix +++ b/pkgs/tools/system/ipmiutil/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { baseName = "ipmiutil"; - version = "3.1.1"; + version = "3.1.2"; name = "${baseName}-${version}"; src = fetchurl { url = "mirror://sourceforge/project/${baseName}/${name}.tar.gz"; - sha256 = "1w1smjhinddf139yir44y88j5bjw5kzmprk2ljc3k6xz3va7v1k0"; + sha256 = "00s7qbmywk3wka985lhhki17xs7d0ll8p172avv1pzmdwfrm703n"; }; buildInputs = [ openssl ]; diff --git a/pkgs/tools/system/logrotate/default.nix b/pkgs/tools/system/logrotate/default.nix index 75e25bcc673..75f60968440 100644 --- a/pkgs/tools/system/logrotate/default.nix +++ b/pkgs/tools/system/logrotate/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchFromGitHub, mailutils, gzip, popt, autoreconfHook }: +{ stdenv, fetchFromGitHub, gzip, popt, autoreconfHook +, mailutils ? null +}: stdenv.mkDerivation rec { name = "logrotate-${version}"; @@ -14,8 +16,11 @@ stdenv.mkDerivation rec { # Logrotate wants to access the 'mail' program; to be done. patchPhase = '' sed -i -e 's,[a-z/]\+gzip,${gzip}/bin/gzip,' \ - -e 's,[a-z/]\+gunzip,${gzip}/bin/gunzip,' \ - -e 's,[a-z/]\+mail,${mailutils}/bin/mail,' configure.ac + -e 's,[a-z/]\+gunzip,${gzip}/bin/gunzip,' configure.ac + + ${stdenv.lib.optionalString (mailutils != null) '' + sed -i -e 's,[a-z/]\+mail,${mailutils}/bin/mail,' configure.ac + ''} ''; autoreconfPhase = '' diff --git a/pkgs/tools/system/netdata/default.nix b/pkgs/tools/system/netdata/default.nix index 7bb98e8e80c..6f86647f4c7 100644 --- a/pkgs/tools/system/netdata/default.nix +++ b/pkgs/tools/system/netdata/default.nix @@ -1,22 +1,19 @@ { stdenv, fetchFromGitHub, autoreconfHook, zlib, pkgconfig, libuuid }: stdenv.mkDerivation rec{ - version = "1.9.0"; + version = "1.10.0"; name = "netdata-${version}"; src = fetchFromGitHub { rev = "v${version}"; owner = "firehol"; repo = "netdata"; - sha256 = "1vy0jz5lxw63b830l9jgf1qqhp41gzapyhdr5k1gwg3zghvlg10w"; + sha256 = "02spfisabjkkgd9fairldlf84n83vbv2xafg0g5jrpfa972pjl9r"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ zlib libuuid ]; - # Allow UI to load when running as non-root - patches = [ ./web_access.patch ]; - # Build will fail trying to create /var/{cache,lib,log}/netdata without this postPatch = '' sed -i '/dist_.*_DATA = \.keep/d' src/Makefile.am diff --git a/pkgs/tools/system/netdata/web_access.patch b/pkgs/tools/system/netdata/web_access.patch deleted file mode 100644 index ae4d29185de..00000000000 --- a/pkgs/tools/system/netdata/web_access.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/src/web_client.c.orig -+++ b/src/web_client.c -@@ -302,7 +302,7 @@ - buffer_strcat_htmlescape(w->response.data, webfilename); - return 404; - } -- -+#if 0 - // check if the file is owned by expected user - if(stat.st_uid != web_files_uid()) { - error("%llu: File '%s' is owned by user %u (expected user %u). Access Denied.", w->id, webfilename, stat.st_uid, web_files_uid()); -@@ -320,7 +320,7 @@ - buffer_strcat_htmlescape(w->response.data, webfilename); - return 403; - } -- -+#endif - if((stat.st_mode & S_IFMT) == S_IFDIR) { - snprintfz(webfilename, FILENAME_MAX, "%s/index.html", filename); - return mysendfile(w, webfilename); diff --git a/pkgs/tools/system/nvtop/default.nix b/pkgs/tools/system/nvtop/default.nix new file mode 100644 index 00000000000..054de73c080 --- /dev/null +++ b/pkgs/tools/system/nvtop/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchFromGitHub, cmake, nvidia_x11, cudatoolkit, ncurses }: + +stdenv.mkDerivation rec { + name = "nvtop-${version}"; + version = "0.2.2"; + + src = fetchFromGitHub { + owner = "Syllo"; + repo = "nvtop"; + rev = version; + sha256 = "0gampikzmd1l0vdhvarl0hckl6kmjh2rwcllpg6rrm2p75njw7hv"; + }; + + cmakeFlags = [ + "-DNVML_INCLUDE_DIRS=${cudatoolkit}/include" + "-DNVML_LIBRARIES=${nvidia_x11}/lib/libnvidia-ml.so.390.67" + "-DCMAKE_BUILD_TYPE=Release" + ]; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ ncurses nvidia_x11 cudatoolkit ]; + + meta = with stdenv.lib; { + description = "A (h)top like like task monitor for NVIDIA GPUs"; + homepage = https://github.com/Syllo/nvtop; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ willibutz ]; + }; +} diff --git a/pkgs/tools/system/osquery/default.nix b/pkgs/tools/system/osquery/default.nix index 5b2be75e452..6cdaec10868 100644 --- a/pkgs/tools/system/osquery/default.nix +++ b/pkgs/tools/system/osquery/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { # this is what `osquery --help` will show as the version. OSQUERY_BUILD_VERSION = version; - OSQUERY_PLATFORM = "nixos;${stdenv.lib.version}"; + OSQUERY_PLATFORM = "NixOS;"; src = fetchFromGitHub { owner = "facebook"; diff --git a/pkgs/tools/system/rsyslog/default.nix b/pkgs/tools/system/rsyslog/default.nix index 81e929382b2..1367871ded4 100644 --- a/pkgs/tools/system/rsyslog/default.nix +++ b/pkgs/tools/system/rsyslog/default.nix @@ -3,7 +3,7 @@ , libdbi ? null, net_snmp ? null, libuuid ? null, curl ? null, gnutls ? null , libgcrypt ? null, liblognorm ? null, openssl ? null, librelp ? null, libksi ? null , libgt ? null, liblogging ? null, libnet ? null, hadoop ? null, rdkafka ? null -, libmongo-client ? null, czmq ? null, rabbitmq-c ? null, hiredis ? null +, libmongo-client ? null, czmq ? null, rabbitmq-c ? null, hiredis ? null, mongoc ? null }: with stdenv.lib; @@ -11,21 +11,21 @@ let mkFlag = cond: name: if cond then "--enable-${name}" else "--disable-${name}"; in stdenv.mkDerivation rec { - name = "rsyslog-8.21.0"; + name = "rsyslog-8.37.0"; src = fetchurl { url = "https://www.rsyslog.com/files/download/rsyslog/${name}.tar.gz"; - sha256 = "1arrhc9fw79sp7dxkf7gyfwibyr2i1000pfds5c7n43mgglgvcdx"; + sha256 = "1rs7y7xgjm82j4mp0897x2myv73kkcj86np37y7qzgca9jdjhp19"; }; #patches = [ ./fix-gnutls-detection.patch ]; nativeBuildInputs = [ pkgconfig autoreconfHook ]; buildInputs = [ - fastJson libestr json_c zlib pythonPackages.docutils libkrb5 jemalloc + fastJson libestr json_c zlib pythonPackages.docutils libkrb5 jemalloc postgresql libdbi net_snmp libuuid curl gnutls libgcrypt liblognorm openssl librelp libgt libksi liblogging libnet hadoop rdkafka libmongo-client czmq - rabbitmq-c hiredis + rabbitmq-c hiredis mongoc ] ++ stdenv.lib.optional (mysql != null) mysql.connector-c ++ stdenv.lib.optional stdenv.isLinux systemd; |