diff options
Diffstat (limited to 'nixpkgs/pkgs/tools/system')
-rw-r--r-- | nixpkgs/pkgs/tools/system/bfs/default.nix | 4 | ||||
-rw-r--r-- | nixpkgs/pkgs/tools/system/ctop/default.nix | 27 | ||||
-rw-r--r-- | nixpkgs/pkgs/tools/system/ctop/deps.nix | 120 | ||||
-rw-r--r-- | nixpkgs/pkgs/tools/system/di/default.nix | 4 | ||||
-rw-r--r-- | nixpkgs/pkgs/tools/system/localtime/default.nix | 14 | ||||
-rw-r--r-- | nixpkgs/pkgs/tools/system/netdata/default.nix | 43 | ||||
-rw-r--r-- | nixpkgs/pkgs/tools/system/netdata/no-files-in-etc-and-var.patch | 81 | ||||
-rw-r--r-- | nixpkgs/pkgs/tools/system/osquery/default.nix | 1 | ||||
-rw-r--r-- | nixpkgs/pkgs/tools/system/syslog-ng/default.nix | 4 |
9 files changed, 104 insertions, 194 deletions
diff --git a/nixpkgs/pkgs/tools/system/bfs/default.nix b/nixpkgs/pkgs/tools/system/bfs/default.nix index a0575067482a..9c6f21009ee3 100644 --- a/nixpkgs/pkgs/tools/system/bfs/default.nix +++ b/nixpkgs/pkgs/tools/system/bfs/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "bfs-${version}"; - version = "1.4.1"; + version = "1.5"; src = fetchFromGitHub { repo = "bfs"; owner = "tavianator"; rev = version; - sha256 = "1y5w8gws4j1i334ap4rsl64scr0hlyrdkdl7ffaghs8fqa6mjmsb"; + sha256 = "0lyrxbmfr4ckz4hx5dgz8xbq479l5rlyrqf205v6c82cap4zyv4x"; }; buildInputs = stdenv.lib.optionals stdenv.isLinux [ libcap acl ]; diff --git a/nixpkgs/pkgs/tools/system/ctop/default.nix b/nixpkgs/pkgs/tools/system/ctop/default.nix index 533f0ab11e40..effc879e4789 100644 --- a/nixpkgs/pkgs/tools/system/ctop/default.nix +++ b/nixpkgs/pkgs/tools/system/ctop/default.nix @@ -1,25 +1,22 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { - name = "ctop-unstable-${version}"; - version = "2017-05-28"; - rev = "b4e1fbf29073625ec803025158636bdbcf2357f4"; - - goPackagePath = "github.com/bcicen/ctop"; +buildGoModule rec { + pname = "ctop"; + version = "0.7.2"; src = fetchFromGitHub { - inherit rev; owner = "bcicen"; - repo = "ctop"; - sha256 = "162pc7gds66cgznqlq9gywr0qij5pymn7xszlq9rn4w2fm64qgg3"; + repo = pname; + rev = "v${version}"; + sha256 = "0mm6hl5qklfv0yffj6cgypsgcrk4fq6p60djycfgj20yhz9cmf9x"; }; - goDeps = ./deps.nix; + modSha256 = "0ad1gvamckg94r7f68cnjdbq9nyz6c3hh339hy4hghxd3rd1qskn"; - meta = with stdenv.lib; { - description = "Concise commandline monitoring for containers"; - homepage = https://ctop.sh/; + meta = with lib; { + description = "Top-like interface for container metrics"; + homepage = "https://ctop.sh/"; license = licenses.mit; - maintainers = with maintainers; [ apeyroux ]; + maintainers = with maintainers; [ apeyroux marsam ]; }; } diff --git a/nixpkgs/pkgs/tools/system/ctop/deps.nix b/nixpkgs/pkgs/tools/system/ctop/deps.nix deleted file mode 100644 index 4fb75cdcd3df..000000000000 --- a/nixpkgs/pkgs/tools/system/ctop/deps.nix +++ /dev/null @@ -1,120 +0,0 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.2.0 -[ - { - goPackagePath = "github.com/docker/docker"; - fetch = { - type = "git"; - url = "https://github.com/docker/docker"; - rev = "599f207b45e74648a8a6a7ac87d77e40930504e9"; - sha256 = "1n0r9ahcx5h2f97ap5fy5hgnpamzzrgihknx7wgvvpm4hrzxm31r"; - }; - } - { - goPackagePath = "github.com/docker/go-units"; - fetch = { - type = "git"; - url = "https://github.com/docker/go-units"; - rev = "0dadbb0345b35ec7ef35e228dabb8de89a65bf52"; - sha256 = "1sqwvcszxqpv77xf2d8fxvryxphdwj9v8f93231wpnk9kpilhyii"; - }; - } - { - goPackagePath = "github.com/fsouza/go-dockerclient"; - fetch = { - type = "git"; - url = "https://github.com/fsouza/go-dockerclient"; - rev = "c933ed18bef34ec2955de03de8ef9a3bb996e3df"; - sha256 = "1qci2m5ifmz3lcmc4y6k9baz9z1i77xnrrcq6zi9mpclhhfr0qzd"; - }; - } - { - goPackagePath = "github.com/gizak/termui"; - fetch = { - type = "git"; - url = "https://github.com/gizak/termui"; - rev = "ea10e6ccee219e572ffad0ac1909f1a17f6db7d6"; - sha256 = "1nxihx4vwxwgq3vnccc8a1v34raqvvsl0p10v1nlvs61rjvs9g32"; - }; - } - { - goPackagePath = "github.com/hashicorp/go-cleanhttp"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/go-cleanhttp"; - rev = "3573b8b52aa7b37b9358d966a898feb387f62437"; - sha256 = "1pbl6p7w5wp1c70x7fp94h4ynk2ajfa76rqin3d2hq1w2fcb7byr"; - }; - } - { - goPackagePath = "github.com/jgautheron/codename-generator"; - fetch = { - type = "git"; - url = "https://github.com/jgautheron/codename-generator"; - rev = "16d037c7cc3c9b552fe4af9828b7338d752dbaf9"; - sha256 = "0v6fji5swnrdjlp3bahv65chnbhxzl25j3hwwnyvvbb4iwa9a376"; - }; - } - { - goPackagePath = "github.com/maruel/panicparse"; - fetch = { - type = "git"; - url = "https://github.com/maruel/panicparse"; - rev = "ae43f192cef2add653fe1481a3070ed00a4a6981"; - sha256 = "11q8v4adbrazqvh24235s5nifck0d1083gbwv4dh5lhd10xlwdvr"; - }; - } - { - goPackagePath = "github.com/mattn/go-runewidth"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-runewidth"; - rev = "97311d9f7767e3d6f422ea06661bc2c7a19e8a5d"; - sha256 = "0dxlrzn570xl7gb11hjy1v4p3gw3r41yvqhrffgw95ha3q9p50cg"; - }; - } - { - goPackagePath = "github.com/mitchellh/go-wordwrap"; - fetch = { - type = "git"; - url = "https://github.com/mitchellh/go-wordwrap"; - rev = "ad45545899c7b13c020ea92b2072220eefad42b8"; - sha256 = "0ny1ddngvwfj3njn7pmqnf3l903lw73ynddw15x8ymp7hidv27v9"; - }; - } - { - goPackagePath = "github.com/nsf/termbox-go"; - fetch = { - type = "git"; - url = "https://github.com/nsf/termbox-go"; - rev = "7994c181db7761ca3c67a217068cf31826113f5f"; - sha256 = "0ssc54wamn3h8z68kv4fdgvk3kjii95psi2kk0slsilmg5v6jzhj"; - }; - } - { - goPackagePath = "github.com/nu7hatch/gouuid"; - fetch = { - type = "git"; - url = "https://github.com/nu7hatch/gouuid"; - rev = "179d4d0c4d8d407a32af483c2354df1d2c91e6c3"; - sha256 = "1isyfix5w1wm26y3a15ha3nnpsxqaxz5ngq06hnh6c6y0inl2fwj"; - }; - } - { - goPackagePath = "github.com/op/go-logging"; - fetch = { - type = "git"; - url = "https://github.com/op/go-logging"; - rev = "970db520ece77730c7e4724c61121037378659d9"; - sha256 = "1cpna2x5l071z1vrnk7zipdkka8dzwsjyx7m79xk0lr08rip0kcj"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "3da985ce5951d99de868be4385f21ea6c2b22f24"; - sha256 = "0mhqa53pyj9gxg4m0c9s0f4r5jp0rihlni1nrpkd1d921xxzh714"; - }; - } -] diff --git a/nixpkgs/pkgs/tools/system/di/default.nix b/nixpkgs/pkgs/tools/system/di/default.nix index 135436e8f112..7d366dc9bd7f 100644 --- a/nixpkgs/pkgs/tools/system/di/default.nix +++ b/nixpkgs/pkgs/tools/system/di/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "di-${version}"; - version = "4.47"; + version = "4.47.1"; src = fetchurl { url = "http://gentoo.com/di/${name}.tar.gz"; - sha256 = "0zlapxlzjizwzwa8xwrwibhcbkh0wx7n74gvjpp6wlwq7cgiq0xm"; + sha256 = "1bdbl9k3gqf4h6g21difqc0w17pjid6r587y19wi37vx36aava7f"; }; makeFlags = [ "INSTALL_DIR=$(out)" ]; diff --git a/nixpkgs/pkgs/tools/system/localtime/default.nix b/nixpkgs/pkgs/tools/system/localtime/default.nix index 45cf378a14ed..39e1bc7b6e7d 100644 --- a/nixpkgs/pkgs/tools/system/localtime/default.nix +++ b/nixpkgs/pkgs/tools/system/localtime/default.nix @@ -1,4 +1,4 @@ -{ stdenv, systemd, polkit, fetchFromGitHub, buildGoPackage, m4}: +{ stdenv, fetchFromGitHub, buildGoPackage, m4 }: buildGoPackage rec { name = "localtime-2017-11-07"; @@ -11,18 +11,20 @@ buildGoPackage rec { }; goPackagePath = "github.com/Stebalien/localtime"; - buildInputs = [ systemd polkit m4 ]; + buildInputs = [ m4 ]; - makeFlags = [ "PREFIX=$(out)" ]; + makeFlags = [ + "PREFIX=${placeholder "out"}" + "BINDIR=${placeholder "bin"}/bin" + ]; buildPhase = '' cd go/src/${goPackagePath} - make localtimed + make $makeFlags ''; installPhase = '' - mkdir -p $bin/bin - install -Dm555 localtimed $bin/bin + make install $makeFlags ''; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/tools/system/netdata/default.nix b/nixpkgs/pkgs/tools/system/netdata/default.nix index ec30c1d070cd..a749595b4154 100644 --- a/nixpkgs/pkgs/tools/system/netdata/default.nix +++ b/nixpkgs/pkgs/tools/system/netdata/default.nix @@ -1,29 +1,52 @@ -{ stdenv, fetchurl, autoreconfHook, pkgconfig, zlib, libuuid, libossp_uuid, CoreFoundation, IOKit, lm_sensors }: +{ stdenv, fetchurl, autoreconfHook, pkgconfig +, CoreFoundation, IOKit, libossp_uuid +, curl, libcap, libuuid, lm_sensors, zlib +, withCups ? false, cups +, withDBengine ? true, libuv, lz4, judy +, withIpmi ? (!stdenv.isDarwin), freeipmi +, withNetfilter ? (!stdenv.isDarwin), libmnl, libnetfilter_acct +, withSsl ? true, openssl +, withDebug ? false +}: -stdenv.mkDerivation rec{ - version = "1.11.1"; +with stdenv.lib; + +stdenv.mkDerivation rec { + version = "1.15.0"; name = "netdata-${version}"; src = fetchurl { url = "https://github.com/netdata/netdata/releases/download/v${version}/netdata-v${version}.tar.gz"; - sha256 = "0djph4586cc14vavj6za6k255lscf3b415dx8k45q3nsc2hb4l01"; + sha256 = "04frfy08k6m70y3s8j3gvnfnqqd9d5mwj3j6krk9dsh34332abvx"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; - buildInputs = [ zlib ] - ++ (if stdenv.isDarwin then [ libossp_uuid CoreFoundation IOKit ] else [ libuuid ]); + buildInputs = [ curl.dev zlib.dev ] + ++ optionals stdenv.isDarwin [ CoreFoundation IOKit libossp_uuid ] + ++ optionals (!stdenv.isDarwin) [ libcap.dev libuuid.dev ] + ++ optionals withCups [ cups ] + ++ optionals withDBengine [ libuv lz4.dev judy ] + ++ optionals withIpmi [ freeipmi ] + ++ optionals withNetfilter [ libmnl libnetfilter_acct ] + ++ optionals withSsl [ openssl.dev ]; patches = [ ./no-files-in-etc-and-var.patch ]; - postInstall = stdenv.lib.optionalString (!stdenv.isDarwin) '' + NIX_CFLAGS_COMPILE = optional withDebug "-O1 -ggdb -DNETDATA_INTERNAL_CHECKS=1"; + + postInstall = 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 + $out/libexec/netdata/plugins.d/apps.plugin.org + ${optionalString withIpmi '' + mv $out/libexec/netdata/plugins.d/freeipmi.plugin \ + $out/libexec/netdata/plugins.d/freeipmi.plugin.org + ''} ''; - preConfigure = '' + preConfigure = optionalString (!stdenv.isDarwin) '' substituteInPlace collectors/python.d.plugin/python_modules/third_party/lm_sensors.py \ --replace 'ctypes.util.find_library("sensors")' '"${lm_sensors.out}/lib/libsensors${stdenv.hostPlatform.extensions.sharedLibrary}"' ''; @@ -37,7 +60,7 @@ stdenv.mkDerivation rec{ rm -r $out/sbin ''; - meta = with stdenv.lib; { + meta = { description = "Real-time performance monitoring tool"; homepage = https://my-netdata.io/; license = licenses.gpl3; diff --git a/nixpkgs/pkgs/tools/system/netdata/no-files-in-etc-and-var.patch b/nixpkgs/pkgs/tools/system/netdata/no-files-in-etc-and-var.patch index bf9b6c19e7c3..c3927c29dd24 100644 --- a/nixpkgs/pkgs/tools/system/netdata/no-files-in-etc-and-var.patch +++ b/nixpkgs/pkgs/tools/system/netdata/no-files-in-etc-and-var.patch @@ -1,14 +1,15 @@ -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 @@ +diff --git a/Makefile.am b/Makefile.am +index f2087bb..7a70cfb 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -116,10 +116,10 @@ AM_CFLAGS = \ $(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 = packaging/installer/.keep +-dist_varlib_DATA = packaging/installer/.keep +-dist_registry_DATA = packaging/installer/.keep +-dist_log_DATA = packaging/installer/.keep +dist_cache_DATA = +dist_varlib_DATA = +dist_registry_DATA = @@ -16,64 +17,70 @@ diff -ruN orig/Makefile.am new/Makefile.am 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 @@ +diff --git a/collectors/charts.d.plugin/Makefile.am b/collectors/charts.d.plugin/Makefile.am +index 2989b4b..64de7d6 100644 +--- a/collectors/charts.d.plugin/Makefile.am ++++ b/collectors/charts.d.plugin/Makefile.am +@@ -32,7 +32,6 @@ dist_charts_DATA = \ userchartsconfigdir=$(configdir)/charts.d dist_userchartsconfig_DATA = \ -- $(top_srcdir)/installer/.keep \ +- .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 @@ +diff --git a/collectors/node.d.plugin/Makefile.am b/collectors/node.d.plugin/Makefile.am +index 3b5a0a5..b7abe01 100644 +--- a/collectors/node.d.plugin/Makefile.am ++++ b/collectors/node.d.plugin/Makefile.am +@@ -23,7 +23,6 @@ dist_noinst_DATA = \ usernodeconfigdir=$(configdir)/node.d dist_usernodeconfig_DATA = \ -- $(top_srcdir)/installer/.keep \ +- .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 @@ +diff --git a/collectors/python.d.plugin/Makefile.am b/collectors/python.d.plugin/Makefile.am +index 652a35d..cf4b2cc 100644 +--- a/collectors/python.d.plugin/Makefile.am ++++ b/collectors/python.d.plugin/Makefile.am +@@ -29,7 +29,6 @@ dist_python_DATA = \ userpythonconfigdir=$(configdir)/python.d dist_userpythonconfig_DATA = \ -- $(top_srcdir)/installer/.keep \ +- .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 @@ +diff --git a/collectors/statsd.plugin/Makefile.am b/collectors/statsd.plugin/Makefile.am +index e63bf98..0f59782 100644 +--- a/collectors/statsd.plugin/Makefile.am ++++ b/collectors/statsd.plugin/Makefile.am +@@ -14,6 +14,5 @@ dist_statsdconfig_DATA = \ userstatsdconfigdir=$(configdir)/statsd.d dist_userstatsdconfig_DATA = \ -- $(top_srcdir)/installer/.keep \ +- .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 @@ +diff --git a/health/Makefile.am b/health/Makefile.am +index 62a4c6d..4d651df 100644 +--- a/health/Makefile.am ++++ b/health/Makefile.am +@@ -16,7 +16,6 @@ dist_noinst_DATA = \ userhealthconfigdir=$(configdir)/health.d dist_userhealthconfig_DATA = \ -- $(top_srcdir)/installer/.keep \ +- .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 @@ +diff --git a/system/Makefile.am b/system/Makefile.am +index b085dca..ccfa588 100644 +--- a/system/Makefile.am ++++ b/system/Makefile.am +@@ -17,10 +17,6 @@ CLEANFILES = \ include $(top_srcdir)/build/subst.inc SUFFIXES = .in diff --git a/nixpkgs/pkgs/tools/system/osquery/default.nix b/nixpkgs/pkgs/tools/system/osquery/default.nix index 36d28098b0be..80341e88dd06 100644 --- a/nixpkgs/pkgs/tools/system/osquery/default.nix +++ b/nixpkgs/pkgs/tools/system/osquery/default.nix @@ -144,5 +144,6 @@ stdenv.mkDerivation rec { license = licenses.bsd3; platforms = platforms.linux; maintainers = with maintainers; [ cstrahan ma27 ]; + broken = true; }; } diff --git a/nixpkgs/pkgs/tools/system/syslog-ng/default.nix b/nixpkgs/pkgs/tools/system/syslog-ng/default.nix index 6999be1c92f4..dcc9942a0611 100644 --- a/nixpkgs/pkgs/tools/system/syslog-ng/default.nix +++ b/nixpkgs/pkgs/tools/system/syslog-ng/default.nix @@ -11,11 +11,11 @@ in stdenv.mkDerivation rec { name = "${pname}-${version}"; - version = "3.21.1"; + version = "3.22.1"; src = fetchurl { url = "https://github.com/balabit/${pname}/releases/download/${name}/${name}.tar.gz"; - sha256 = "09fdjschp3shy8xp0hh5fh6qv25433zd0biv0igkmkvrmnjks5ld"; + sha256 = "1j3l9pn3lf9w87vvwbnxk098gprbqzmfpfw1rch46mgsfqvl8mh6"; }; nativeBuildInputs = [ pkgconfig which ]; |