From 4d2a8257edc33f03fc4bb26ff32f9db1d96c7d95 Mon Sep 17 00:00:00 2001 From: Jason Felice Date: Wed, 19 Feb 2020 20:31:14 -0500 Subject: plan9port: fix linker flags for macosx --- pkgs/tools/system/plan9port/builder.sh | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) (limited to 'pkgs/tools/system') diff --git a/pkgs/tools/system/plan9port/builder.sh b/pkgs/tools/system/plan9port/builder.sh index f5c447ea0a53..57716614a13e 100644 --- a/pkgs/tools/system/plan9port/builder.sh +++ b/pkgs/tools/system/plan9port/builder.sh @@ -8,13 +8,20 @@ plan9portLinkFlags() local -a linkFlags=() eval set -- "$NIX_LDFLAGS" while (( $# > 0 )); do - if [[ $1 = -rpath ]]; then - linkFlags+=( "-Wl,-rpath,$2" ) + case "$1" in + -rpath|-macosx_version_min|-sdk_version) + linkFlags+=( "-Wl,$1,$2" ) shift 2 - else + ;; + -no_uuid) + linkFlags+=( "-Wl,$1" ) + shift + ;; + *) linkFlags+=( "$1" ) shift - fi + ;; + esac done echo "${linkFlags[*]}" } -- cgit 1.4.1 From 7724ef793adcfbbd9cd46f8836a3618687ee110d Mon Sep 17 00:00:00 2001 From: Jason Felice Date: Thu, 20 Feb 2020 17:40:30 -0500 Subject: plan9port: wrap ALL linker flags --- pkgs/tools/system/plan9port/builder.sh | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) (limited to 'pkgs/tools/system') diff --git a/pkgs/tools/system/plan9port/builder.sh b/pkgs/tools/system/plan9port/builder.sh index 57716614a13e..7750de700617 100644 --- a/pkgs/tools/system/plan9port/builder.sh +++ b/pkgs/tools/system/plan9port/builder.sh @@ -5,25 +5,11 @@ export PLAN9_TARGET=$PLAN9 plan9portLinkFlags() { - local -a linkFlags=() eval set -- "$NIX_LDFLAGS" - while (( $# > 0 )); do - case "$1" in - -rpath|-macosx_version_min|-sdk_version) - linkFlags+=( "-Wl,$1,$2" ) - shift 2 - ;; - -no_uuid) - linkFlags+=( "-Wl,$1" ) - shift - ;; - *) - linkFlags+=( "$1" ) - shift - ;; - esac + local flag + for flag in "$@"; do + printf ' -Wl,%s' "$flag" done - echo "${linkFlags[*]}" } configurePhase() -- cgit 1.4.1 From a87baff257b8f9c4aa0ee8a934261cd370b6ee51 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Thu, 20 Feb 2020 21:39:41 -0800 Subject: throttled: 0.6 -> 0.7 --- pkgs/tools/system/throttled/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'pkgs/tools/system') diff --git a/pkgs/tools/system/throttled/default.nix b/pkgs/tools/system/throttled/default.nix index 4f52b5e09455..02ff75113824 100644 --- a/pkgs/tools/system/throttled/default.nix +++ b/pkgs/tools/system/throttled/default.nix @@ -2,24 +2,24 @@ stdenv.mkDerivation rec { pname = "throttled"; - version = "0.6"; + version = "0.7"; src = fetchFromGitHub { owner = "erpalma"; repo = pname; rev = "v${version}"; - sha256 = "1icb2288pj25vbdnd16zvisw9c01hp8vkk25ilkc74gy76xhpcs4"; + sha256 = "1y1sczvj2qc8ml9i1rdzr8hklvci9bdphm3mmri2ncaqys8wdbh4"; }; nativeBuildInputs = [ python3Packages.wrapPython ]; - pythonPath = with python3Packages; [ + pythonPath = with python3Packages; [ configparser dbus-python pygobject3 ]; - # The upstream unit both assumes the install location, and tries to run in a virtualenv + # The upstream unit both assumes the install location, and tries to run in a virtualenv postPatch = ''sed -e 's|ExecStart=.*|ExecStart=${placeholder "out"}/bin/lenovo_fix.py|' -i systemd/lenovo_fix.service''; installPhase = '' -- cgit 1.4.1 From cf0e6a48e9fdb5de85783747d89eafb76593db38 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 20 Feb 2020 14:00:51 +0100 Subject: s-tui: migrate to python3 Includes LC_ALL = "en_US.UTF-8"; that resolves a locale.Error exception during the check phase. [...] File "/build/s-tui-1.0.0/s_tui/sensors_menu.py", line 27, in import urwid File "/nix/store/xxhpq1kcjy0kimfwnwqlzh2pchkp9khi-python3.7-urwid-2.1.0/lib/python3.7/site-packages/urwid/__init__.py", line 26, in from urwid.widget import (FLOW, BOX, FIXED, LEFT, RIGHT, CENTER, TOP, MIDDLE, File "/nix/store/xxhpq1kcjy0kimfwnwqlzh2pchkp9khi-python3.7-urwid-2.1.0/lib/python3.7/site-packages/urwid/widget.py", line 27, in from urwid.util import (MetaSuper, decompose_tagmarkup, calc_width, File "/nix/store/xxhpq1kcjy0kimfwnwqlzh2pchkp9khi-python3.7-urwid-2.1.0/lib/python3.7/site-packages/urwid/util.py", line 61, in detected_encoding = detect_encoding() File "/nix/store/xxhpq1kcjy0kimfwnwqlzh2pchkp9khi-python3.7-urwid-2.1.0/lib/python3.7/site-packages/urwid/util.py", line 58, in detect_encoding locale.setlocale(locale.LC_ALL, initial) File "/nix/store/ja04f3cmapzb3f2mvjrb883bfqclsirq-python3-3.7.6/lib/python3.7/locale.py", line 608, in setlocale return _setlocale(category, locale) locale.Error: unsupported locale setting --- pkgs/tools/system/s-tui/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'pkgs/tools/system') diff --git a/pkgs/tools/system/s-tui/default.nix b/pkgs/tools/system/s-tui/default.nix index 924269b6637c..a6816daae33a 100644 --- a/pkgs/tools/system/s-tui/default.nix +++ b/pkgs/tools/system/s-tui/default.nix @@ -1,19 +1,21 @@ -{ stdenv, pythonPackages }: +{ stdenv, python3Packages }: -pythonPackages.buildPythonPackage rec { +python3Packages.buildPythonPackage rec { pname = "s-tui"; version = "1.0.0"; - src = pythonPackages.fetchPypi { + src = python3Packages.fetchPypi { inherit pname version; sha256 = "0r5yhlsi5xiy7ii1w4kqkaxz9069v5bbfwi3x3xnxhk51yjfgr8n"; }; - propagatedBuildInputs = with pythonPackages; [ + propagatedBuildInputs = with python3Packages; [ urwid psutil ]; + LC_ALL = "en_US.UTF-8"; + meta = with stdenv.lib; { homepage = https://amanusk.github.io/s-tui/; description = "Stress-Terminal UI monitoring tool"; -- cgit 1.4.1 From 076e16989d68300ebffe64f4e7b010fc97cff478 Mon Sep 17 00:00:00 2001 From: Jörg Thalheim Date: Sat, 22 Feb 2020 07:45:50 +0000 Subject: netdata: 1.19.0 -> 1.20.0 --- pkgs/tools/system/netdata/default.nix | 15 +- pkgs/tools/system/netdata/deps.nix | 534 +++++++++++++++++++++ pkgs/tools/system/netdata/go.d.plugin.nix | 30 ++ .../system/netdata/no-files-in-etc-and-var.patch | 176 +++---- 4 files changed, 649 insertions(+), 106 deletions(-) create mode 100644 pkgs/tools/system/netdata/deps.nix create mode 100644 pkgs/tools/system/netdata/go.d.plugin.nix (limited to 'pkgs/tools/system') diff --git a/pkgs/tools/system/netdata/default.nix b/pkgs/tools/system/netdata/default.nix index 4f8cfb966e86..714efb918539 100644 --- a/pkgs/tools/system/netdata/default.nix +++ b/pkgs/tools/system/netdata/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig +{ stdenv, callPackage, fetchFromGitHub, autoreconfHook, pkgconfig , CoreFoundation, IOKit, libossp_uuid , curl, libcap, libuuid, lm_sensors, zlib , withCups ? false, cups @@ -11,15 +11,17 @@ with stdenv.lib; -stdenv.mkDerivation rec { - version = "1.19.0"; +let + go-d-plugin = callPackage ./go.d.plugin.nix {}; +in stdenv.mkDerivation rec { + version = "1.20.0"; pname = "netdata"; src = fetchFromGitHub { owner = "netdata"; repo = "netdata"; rev = "v${version}"; - sha256 = "1s6kzx4xh8b6v7ki8h2mfzprj5rxvlgx2md20cr8c0v81qpz3q3q"; + sha256 = "0g7iv5w14wndl5iv2q81dppgwq09sm93vpnyq7p49nl7q1dsz1d6"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; @@ -38,7 +40,10 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = optionalString withDebug "-O1 -ggdb -DNETDATA_INTERNAL_CHECKS=1"; - postInstall = optionalString (!stdenv.isDarwin) '' + postInstall = '' + ln -s ${go-d-plugin.bin}/lib/netdata/conf.d/* $out/lib/netdata/conf.d + ln -s ${go-d-plugin.bin}/bin/godplugind $out/libexec/netdata/plugins.d/go.d.plugin + '' + 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 diff --git a/pkgs/tools/system/netdata/deps.nix b/pkgs/tools/system/netdata/deps.nix new file mode 100644 index 000000000000..10d933c5a568 --- /dev/null +++ b/pkgs/tools/system/netdata/deps.nix @@ -0,0 +1,534 @@ +# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) +[ + { + goPackagePath = "github.com/OneOfOne/xxhash"; + fetch = { + type = "git"; + url = "https://github.com/OneOfOne/xxhash"; + rev = "v1.2.2"; + sha256 = "1mjfhrwhvxa48rycjnqpqzm521i38h1hdyz6pdwmhd7xb8j6gwi6"; + }; + } + { + goPackagePath = "github.com/Wing924/ltsv"; + fetch = { + type = "git"; + url = "https://github.com/Wing924/ltsv"; + rev = "v0.3.1"; + sha256 = "05jl8myq16y847wmx6cmlxl50z86cpiv9pq4fflmac7lp4hf67m3"; + }; + } + { + goPackagePath = "github.com/alecthomas/template"; + fetch = { + type = "git"; + url = "https://github.com/alecthomas/template"; + rev = "fb15b899a751"; + sha256 = "1vlasv4dgycydh5wx6jdcvz40zdv90zz1h7836z7lhsi2ymvii26"; + }; + } + { + goPackagePath = "github.com/alecthomas/units"; + fetch = { + type = "git"; + url = "https://github.com/alecthomas/units"; + rev = "c3de453c63f4"; + sha256 = "0js37zlgv37y61j4a2d46jh72xm5kxmpaiw0ya9v944bjpc386my"; + }; + } + { + goPackagePath = "github.com/axiomhq/hyperloglog"; + fetch = { + type = "git"; + url = "https://github.com/axiomhq/hyperloglog"; + rev = "a4c4c47bc57f"; + sha256 = "0pwjxyhn0ms3n1q0hbqb5gz2lxb28giflkya9ck2lwfyd28y254s"; + }; + } + { + goPackagePath = "github.com/beorn7/perks"; + fetch = { + type = "git"; + url = "https://github.com/beorn7/perks"; + rev = "v1.0.0"; + sha256 = "1i1nz1f6g55xi2y3aiaz5kqfgvknarbfl4f0sx4nyyb4s7xb1z9x"; + }; + } + { + goPackagePath = "github.com/cespare/xxhash"; + fetch = { + type = "git"; + url = "https://github.com/cespare/xxhash"; + rev = "v1.1.0"; + sha256 = "1qyzlcdcayavfazvi03izx83fvip8h36kis44zr2sg7xf6sx6l4x"; + }; + } + { + goPackagePath = "github.com/davecgh/go-spew"; + fetch = { + type = "git"; + url = "https://github.com/davecgh/go-spew"; + rev = "v1.1.1"; + sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y"; + }; + } + { + goPackagePath = "github.com/davecgh/go-xdr"; + fetch = { + type = "git"; + url = "https://github.com/davecgh/go-xdr"; + rev = "e6a2ba005892"; + sha256 = "0vifrz4iil4r7k8sz5iqlfbh80ysgs5abp2simgyhsbrkxrrsrrd"; + }; + } + { + goPackagePath = "github.com/dgryski/go-metro"; + fetch = { + type = "git"; + url = "https://github.com/dgryski/go-metro"; + rev = "280f6062b5bc"; + sha256 = "1a82ksyklh1lcpgzh07ik78pgz4m0b3q921yfglafd7v0ld6xljr"; + }; + } + { + goPackagePath = "github.com/go-kit/kit"; + fetch = { + type = "git"; + url = "https://github.com/go-kit/kit"; + rev = "v0.9.0"; + sha256 = "09038mnw705h7isbjp8dzgp2i04bp5rqkmifxvwc5xkh75s00qpw"; + }; + } + { + goPackagePath = "github.com/go-logfmt/logfmt"; + fetch = { + type = "git"; + url = "https://github.com/go-logfmt/logfmt"; + rev = "v0.4.0"; + sha256 = "06smxc112xmixz78nyvk3b2hmc7wasf2sl5vxj1xz62kqcq9lzm9"; + }; + } + { + goPackagePath = "github.com/go-sql-driver/mysql"; + fetch = { + type = "git"; + url = "https://github.com/go-sql-driver/mysql"; + rev = "v1.5.0"; + sha256 = "11x0m9yf3kdnf6981182r824psgxwfaqhn3x3in4yiidp0w0hk3v"; + }; + } + { + goPackagePath = "github.com/go-stack/stack"; + fetch = { + type = "git"; + url = "https://github.com/go-stack/stack"; + rev = "v1.8.0"; + sha256 = "0wk25751ryyvxclyp8jdk5c3ar0cmfr8lrjb66qbg4808x66b96v"; + }; + } + { + goPackagePath = "github.com/gogo/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/gogo/protobuf"; + rev = "v1.1.1"; + sha256 = "1525pq7r6h3s8dncvq8gxi893p2nq8dxpzvq0nfl5b4p6mq0v1c2"; + }; + } + { + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "v1.3.2"; + sha256 = "1k1wb4zr0qbwgpvz9q5ws9zhlal8hq7dmq62pwxxriksayl6hzym"; + }; + } + { + goPackagePath = "github.com/google/uuid"; + fetch = { + type = "git"; + url = "https://github.com/google/uuid"; + rev = "6a5e28554805"; + sha256 = "0q1zwabj77agp1yljqjlf31ip8c6lr25xwqlw3zzfgha81y45lv0"; + }; + } + { + goPackagePath = "github.com/influxdata/influxdb"; + fetch = { + type = "git"; + url = "https://github.com/influxdata/influxdb"; + rev = "v1.7.6"; + sha256 = "07abzhmsgj7krmhf7jis50a4fc4w29h48nyzgvrll5lz3cax979q"; + }; + } + { + goPackagePath = "github.com/jessevdk/go-flags"; + fetch = { + type = "git"; + url = "https://github.com/jessevdk/go-flags"; + rev = "v1.4.0"; + sha256 = "0algnnigph27spgn655zm4723yfjxjjvlf4k14z9drj3682df25a"; + }; + } + { + goPackagePath = "github.com/json-iterator/go"; + fetch = { + type = "git"; + url = "https://github.com/json-iterator/go"; + rev = "v1.1.6"; + sha256 = "08caswxvdn7nvaqyj5kyny6ghpygandlbw9vxdj7l5vkp7q0s43r"; + }; + } + { + goPackagePath = "github.com/julienschmidt/httprouter"; + fetch = { + type = "git"; + url = "https://github.com/julienschmidt/httprouter"; + rev = "v1.2.0"; + sha256 = "1k8bylc9s4vpvf5xhqh9h246dl1snxrzzz0614zz88cdh8yzs666"; + }; + } + { + goPackagePath = "github.com/konsorten/go-windows-terminal-sequences"; + fetch = { + type = "git"; + url = "https://github.com/konsorten/go-windows-terminal-sequences"; + rev = "v1.0.1"; + sha256 = "1lchgf27n276vma6iyxa0v1xds68n2g8lih5lavqnx5x6q5pw2ip"; + }; + } + { + goPackagePath = "github.com/kr/logfmt"; + fetch = { + type = "git"; + url = "https://github.com/kr/logfmt"; + rev = "b84e30acd515"; + sha256 = "02ldzxgznrfdzvghfraslhgp19la1fczcbzh7wm2zdc6lmpd1qq9"; + }; + } + { + goPackagePath = "github.com/kr/pretty"; + fetch = { + type = "git"; + url = "https://github.com/kr/pretty"; + rev = "v0.1.0"; + sha256 = "18m4pwg2abd0j9cn5v3k2ksk9ig4vlwxmlw9rrglanziv9l967qp"; + }; + } + { + goPackagePath = "github.com/kr/pty"; + fetch = { + type = "git"; + url = "https://github.com/kr/pty"; + rev = "v1.1.1"; + sha256 = "0383f0mb9kqjvncqrfpidsf8y6ns5zlrc91c6a74xpyxjwvzl2y6"; + }; + } + { + goPackagePath = "github.com/kr/text"; + fetch = { + type = "git"; + url = "https://github.com/kr/text"; + rev = "v0.1.0"; + sha256 = "1gm5bsl01apvc84bw06hasawyqm4q84vx1pm32wr9jnd7a8vjgj1"; + }; + } + { + goPackagePath = "github.com/mattn/go-isatty"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-isatty"; + rev = "v0.0.7"; + sha256 = "1i77aq4gf9as03m8fpfh8fq49n4z9j7548blrcsidm1xhslzk5xd"; + }; + } + { + goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; + fetch = { + type = "git"; + url = "https://github.com/matttproud/golang_protobuf_extensions"; + rev = "v1.0.1"; + sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya"; + }; + } + { + goPackagePath = "github.com/miekg/dns"; + fetch = { + type = "git"; + url = "https://github.com/miekg/dns"; + rev = "v1.1.27"; + sha256 = "0fpd9alvhzrkb1c31n4lrxlpv1nlhy51w1yg39xxb3mjmrb7lby1"; + }; + } + { + goPackagePath = "github.com/mitchellh/go-homedir"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/go-homedir"; + rev = "v1.1.0"; + sha256 = "0ydzkipf28hwj2bfxqmwlww47khyk6d152xax4bnyh60f4lq3nx1"; + }; + } + { + goPackagePath = "github.com/modern-go/concurrent"; + fetch = { + type = "git"; + url = "https://github.com/modern-go/concurrent"; + rev = "bacd9c7ef1dd"; + sha256 = "0s0fxccsyb8icjmiym5k7prcqx36hvgdwl588y0491gi18k5i4zs"; + }; + } + { + goPackagePath = "github.com/modern-go/reflect2"; + fetch = { + type = "git"; + url = "https://github.com/modern-go/reflect2"; + rev = "v1.0.1"; + sha256 = "06a3sablw53n1dqqbr2f53jyksbxdmmk8axaas4yvnhyfi55k4lf"; + }; + } + { + goPackagePath = "github.com/mwitkow/go-conntrack"; + fetch = { + type = "git"; + url = "https://github.com/mwitkow/go-conntrack"; + rev = "cc309e4a2223"; + sha256 = "0nbrnpk7bkmqg9mzwsxlm0y8m7s9qd9phr1q30qlx2qmdmz7c1mf"; + }; + } + { + goPackagePath = "github.com/netdata/go-orchestrator"; + fetch = { + type = "git"; + url = "https://github.com/netdata/go-orchestrator"; + rev = "c793edba0e8f"; + sha256 = "0bqvqdkd510yl3c9f86h6ii7r1l5sjx0x655lzgv6cahq90k3pr7"; + }; + } + { + goPackagePath = "github.com/pkg/errors"; + fetch = { + type = "git"; + url = "https://github.com/pkg/errors"; + rev = "v0.8.1"; + sha256 = "0g5qcb4d4fd96midz0zdk8b9kz8xkzwfa8kr1cliqbg8sxsy5vd1"; + }; + } + { + goPackagePath = "github.com/pmezard/go-difflib"; + fetch = { + type = "git"; + url = "https://github.com/pmezard/go-difflib"; + rev = "v1.0.0"; + sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; + }; + } + { + goPackagePath = "github.com/prometheus/client_golang"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_golang"; + rev = "v1.0.0"; + sha256 = "1f03ndyi3jq7zdxinnvzimz3s4z2374r6dikkc8i42xzb6d1bli6"; + }; + } + { + goPackagePath = "github.com/prometheus/client_model"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_model"; + rev = "v0.2.0"; + sha256 = "0jffnz94d6ff39fr96b5w8i8yk26pwnrfggzz8jhi8k0yihg2c9d"; + }; + } + { + goPackagePath = "github.com/prometheus/common"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/common"; + rev = "v0.9.0"; + sha256 = "0gvfb622fjybvhwh8rjpgnz2zxrz9cdc1kzn40hk4hyqg5435w3b"; + }; + } + { + goPackagePath = "github.com/prometheus/procfs"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/procfs"; + rev = "v0.0.2"; + sha256 = "0s7pvs7fgnfpmym3cd0k219av321h9sf3yvdlnn3qy0ps280lg7k"; + }; + } + { + goPackagePath = "github.com/prometheus/prometheus"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/prometheus"; + rev = "v2.5.0"; + sha256 = "07sgsmazjr5lgkbaz63qanpg536pyfb7asljz67rqz6c47ngzifp"; + }; + } + { + goPackagePath = "github.com/sirupsen/logrus"; + fetch = { + type = "git"; + url = "https://github.com/sirupsen/logrus"; + rev = "v1.4.2"; + sha256 = "087k2lxrr9p9dh68yw71d05h5g9p5v26zbwd6j7lghinjfaw334x"; + }; + } + { + goPackagePath = "github.com/spaolacci/murmur3"; + fetch = { + type = "git"; + url = "https://github.com/spaolacci/murmur3"; + rev = "f09979ecbc72"; + sha256 = "1lv3zyz3jy2d76bhvvs8svygx66606iygdvwy5cwc0p5z8yghq25"; + }; + } + { + goPackagePath = "github.com/stretchr/objx"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/objx"; + rev = "v0.1.1"; + sha256 = "0iph0qmpyqg4kwv8jsx6a56a7hhqq8swrazv40ycxk9rzr0s8yls"; + }; + } + { + goPackagePath = "github.com/stretchr/testify"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/testify"; + rev = "v1.4.0"; + sha256 = "187i5g88sxfy4vxpm7dw1gwv29pa2qaq475lxrdh5livh69wqfjb"; + }; + } + { + goPackagePath = "github.com/vmware/govmomi"; + fetch = { + type = "git"; + url = "https://github.com/vmware/govmomi"; + rev = "v0.22.1"; + sha256 = "1z4am6143jrrls0023flnqgadm1z9p60w09cp1j5pnslm60vvw78"; + }; + } + { + goPackagePath = "github.com/vmware/vmw-guestinfo"; + fetch = { + type = "git"; + url = "https://github.com/vmware/vmw-guestinfo"; + rev = "25eff159a728"; + sha256 = "1nag33p0i6zxh25kf0hpdsc3n1agrjsncdqqj8sxd2q1zf7lhf5j"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "87dc89f01550"; + sha256 = "0z4i1m2yn3f31ci7wvcm2rxkx2yiv7a78mfzklncmsz2k97rlh2g"; + }; + } + { + goPackagePath = "golang.org/x/mod"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/mod"; + rev = "c90efee705ee"; + sha256 = "0i5md645rmcy5z5ij9ng428k9rz4g3k1kjy3blsq1264rn426gdf"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "aa69164e4478"; + sha256 = "1w0r52a9csj5vkhysvdx6l5v2dq1lnmvs95ffhpibypjha7lq214"; + }; + } + { + goPackagePath = "golang.org/x/sync"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sync"; + rev = "112230192c58"; + sha256 = "05i2k43j2d0llq768hg5pf3hb2yhfzp9la1w5wp0rsnnzblr0lfn"; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "2837fb4f24fe"; + sha256 = "01wrq33y1bjkk0kpxhs59iq7i95llhs2f8k0v5mr3f6wd46v4h5b"; + }; + } + { + goPackagePath = "golang.org/x/text"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/text"; + rev = "v0.3.0"; + sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19"; + }; + } + { + goPackagePath = "golang.org/x/tools"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/tools"; + rev = "49a3e744a425"; + sha256 = "0xx4gv9wpv36crk7gv7imf5vzzs2mz7zla2q2jkck3xnzff8fw3v"; + }; + } + { + goPackagePath = "golang.org/x/xerrors"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/xerrors"; + rev = "1b5146add898"; + sha256 = "0w2akj91krxjag0xdhsg78470888nicc5ismc2ap9jqpss6v1zih"; + }; + } + { + goPackagePath = "gopkg.in/alecthomas/kingpin.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/alecthomas/kingpin.v2"; + rev = "v2.2.6"; + sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r"; + }; + } + { + goPackagePath = "gopkg.in/check.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/check.v1"; + rev = "20d25e280405"; + sha256 = "0k1m83ji9l1a7ng8a7v40psbymxasmssbrrhpdv2wl4rhs0nc3np"; + }; + } + { + goPackagePath = "gopkg.in/yaml.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/yaml.v2"; + rev = "v2.2.7"; + sha256 = "0k5xcwkd3wmcx54isk7ck9cwp8fapfhyqdz3f13kxp77cxqizazj"; + }; + } + { + goPackagePath = "layeh.com/radius"; + fetch = { + type = "git"; + url = "https://github.com/layeh/radius"; + rev = "890bc1058917"; + sha256 = "01ncxwmlj5xjz4kd4pbp77xqqgixip492ilczk7ac0fivjcvdnb3"; + }; + } +] diff --git a/pkgs/tools/system/netdata/go.d.plugin.nix b/pkgs/tools/system/netdata/go.d.plugin.nix new file mode 100644 index 000000000000..0e1de1bbd8e7 --- /dev/null +++ b/pkgs/tools/system/netdata/go.d.plugin.nix @@ -0,0 +1,30 @@ +{ lib, fetchFromGitHub, buildGoPackage }: + +buildGoPackage rec { + pname = "netdata-go.d.plugin"; + version = "0.15.0"; + + src = fetchFromGitHub { + owner = "netdata"; + repo = "go.d.plugin"; + rev = "v${version}"; + sha256 = "0v732mndhgrbqiwsdndqd08pvgbvl4ffn5rqbyv7iw1dwwr08f67"; + }; + + goPackagePath = "github.com/netdata/go.d.plugin"; + + postInstall = '' + mkdir -p $bin/lib/netdata/conf.d + cp -r go/src/${goPackagePath}/config/* $bin/lib/netdata/conf.d + ''; + + goDeps = ./deps.nix; + + meta = with lib; { + description = "Netdata orchestrator for data collection modules written in go"; + homepage = https://github.com/netdata/go.d.plugin; + license = licenses.gpl3; + platforms = platforms.unix; + maintainers = [ maintainers.lethalman ]; + }; +} diff --git a/pkgs/tools/system/netdata/no-files-in-etc-and-var.patch b/pkgs/tools/system/netdata/no-files-in-etc-and-var.patch index 138787b98f1f..594805fdf187 100644 --- a/pkgs/tools/system/netdata/no-files-in-etc-and-var.patch +++ b/pkgs/tools/system/netdata/no-files-in-etc-and-var.patch @@ -1,155 +1,129 @@ -diff --git a/Makefile.am b/Makefile.am -index 2625dcc..1fdd645 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -113,10 +113,10 @@ AM_CFLAGS = \ - $(NULL) - - sbin_PROGRAMS = --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 = -+dist_log_DATA = - plugins_PROGRAMS = - - LIBNETDATA_FILES = \ +From 4ecc1475be94a384c122594b5f7d455beb64a2f0 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= +Date: Sat, 22 Feb 2020 06:42:14 +0000 +Subject: [PATCH] no files in etc and var +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Jörg Thalheim +--- + collectors/Makefile.am | 2 +- + collectors/charts.d.plugin/Makefile.am | 2 +- + collectors/node.d.plugin/Makefile.am | 2 +- + collectors/python.d.plugin/Makefile.am | 2 +- + collectors/statsd.plugin/Makefile.am | 2 +- + health/Makefile.am | 2 +- + system/Makefile.am | 3 +-- + web/Makefile.am | 2 +- + 8 files changed, 8 insertions(+), 9 deletions(-) + diff --git a/collectors/Makefile.am b/collectors/Makefile.am -index 7431025..f62f8ac 100644 +index 9bb52958..c9799165 100644 --- a/collectors/Makefile.am +++ b/collectors/Makefile.am -@@ -30,11 +30,6 @@ SUBDIRS = \ - usercustompluginsconfigdir=$(configdir)/custom-plugins.d +@@ -32,7 +32,7 @@ usercustompluginsconfigdir=$(configdir)/custom-plugins.d usergoconfigdir=$(configdir)/go.d --# Explicitly install directories to avoid permission issues due to umask + # Explicitly install directories to avoid permission issues due to umask -install-exec-local: -- $(INSTALL) -d $(DESTDIR)$(usercustompluginsconfigdir) -- $(INSTALL) -d $(DESTDIR)$(usergoconfigdir) -- - dist_noinst_DATA = \ - README.md \ - $(NULL) ++no-install-exec-local: + $(INSTALL) -d $(DESTDIR)$(usercustompluginsconfigdir) + $(INSTALL) -d $(DESTDIR)$(usergoconfigdir) + diff --git a/collectors/charts.d.plugin/Makefile.am b/collectors/charts.d.plugin/Makefile.am -index b3b2fb9..68b768e 100644 +index 03c7f0a9..01985db0 100644 --- a/collectors/charts.d.plugin/Makefile.am +++ b/collectors/charts.d.plugin/Makefile.am -@@ -31,13 +31,8 @@ dist_charts_DATA = \ - - userchartsconfigdir=$(configdir)/charts.d - dist_userchartsconfig_DATA = \ -- .keep \ +@@ -34,7 +34,7 @@ dist_userchartsconfig_DATA = \ $(NULL) --# Explicitly install directories to avoid permission issues due to umask + # Explicitly install directories to avoid permission issues due to umask -install-exec-local: -- $(INSTALL) -d $(DESTDIR)$(userchartsconfigdir) -- ++no-install-exec-local: + $(INSTALL) -d $(DESTDIR)$(userchartsconfigdir) + chartsconfigdir=$(libconfigdir)/charts.d - dist_chartsconfig_DATA = \ - $(NULL) diff --git a/collectors/node.d.plugin/Makefile.am b/collectors/node.d.plugin/Makefile.am -index 411bce9..ba60276 100644 +index c3142d43..95e32445 100644 --- a/collectors/node.d.plugin/Makefile.am +++ b/collectors/node.d.plugin/Makefile.am -@@ -23,13 +23,8 @@ dist_noinst_DATA = \ - - usernodeconfigdir=$(configdir)/node.d - dist_usernodeconfig_DATA = \ -- .keep \ +@@ -26,7 +26,7 @@ dist_usernodeconfig_DATA = \ $(NULL) --# Explicitly install directories to avoid permission issues due to umask + # Explicitly install directories to avoid permission issues due to umask -install-exec-local: -- $(INSTALL) -d $(DESTDIR)$(usernodeconfigdir) -- ++no-install-exec-local: + $(INSTALL) -d $(DESTDIR)$(usernodeconfigdir) + nodeconfigdir=$(libconfigdir)/node.d - dist_nodeconfig_DATA = \ - $(NULL) diff --git a/collectors/python.d.plugin/Makefile.am b/collectors/python.d.plugin/Makefile.am -index cb14e35..8a6c5a7 100644 +index e678f86a..29a319da 100644 --- a/collectors/python.d.plugin/Makefile.am +++ b/collectors/python.d.plugin/Makefile.am -@@ -29,13 +29,8 @@ dist_python_DATA = \ - - userpythonconfigdir=$(configdir)/python.d - dist_userpythonconfig_DATA = \ -- .keep \ +@@ -32,7 +32,7 @@ dist_userpythonconfig_DATA = \ $(NULL) --# Explicitly install directories to avoid permission issues due to umask + # Explicitly install directories to avoid permission issues due to umask -install-exec-local: -- $(INSTALL) -d $(DESTDIR)$(userpythonconfigdir) -- ++no-install-exec-local: + $(INSTALL) -d $(DESTDIR)$(userpythonconfigdir) + pythonconfigdir=$(libconfigdir)/python.d - dist_pythonconfig_DATA = \ - $(NULL) diff --git a/collectors/statsd.plugin/Makefile.am b/collectors/statsd.plugin/Makefile.am -index 87b6ca7..9d010c7 100644 +index b01302d1..f5b77da4 100644 --- a/collectors/statsd.plugin/Makefile.am +++ b/collectors/statsd.plugin/Makefile.am -@@ -14,9 +14,4 @@ dist_statsdconfig_DATA = \ - - userstatsdconfigdir=$(configdir)/statsd.d - dist_userstatsdconfig_DATA = \ -- .keep \ +@@ -17,5 +17,5 @@ dist_userstatsdconfig_DATA = \ $(NULL) -- --# Explicitly install directories to avoid permission issues due to umask + + # Explicitly install directories to avoid permission issues due to umask -install-exec-local: -- $(INSTALL) -d $(DESTDIR)$(userstatsdconfigdir) ++no-install-exec-local: + $(INSTALL) -d $(DESTDIR)$(userstatsdconfigdir) diff --git a/health/Makefile.am b/health/Makefile.am -index f63faa8..8912ef2 100644 +index 853ed0d7..210330a6 100644 --- a/health/Makefile.am +++ b/health/Makefile.am -@@ -16,13 +16,8 @@ dist_noinst_DATA = \ - - userhealthconfigdir=$(configdir)/health.d - dist_userhealthconfig_DATA = \ -- .keep \ +@@ -19,7 +19,7 @@ dist_userhealthconfig_DATA = \ $(NULL) --# Explicitly install directories to avoid permission issues due to umask + # Explicitly install directories to avoid permission issues due to umask -install-exec-local: -- $(INSTALL) -d $(DESTDIR)$(userhealthconfigdir) -- ++no-install-exec-local: + $(INSTALL) -d $(DESTDIR)$(userhealthconfigdir) + healthconfigdir=$(libconfigdir)/health.d - dist_healthconfig_DATA = \ - health.d/adaptec_raid.conf \ diff --git a/system/Makefile.am b/system/Makefile.am -index ad68c65..bf6a840 100644 +index ad68c655..74f032f9 100644 --- a/system/Makefile.am +++ b/system/Makefile.am -@@ -16,14 +16,6 @@ CLEANFILES = \ - include $(top_srcdir)/build/subst.inc +@@ -17,11 +17,10 @@ include $(top_srcdir)/build/subst.inc SUFFIXES = .in --dist_config_SCRIPTS = \ + dist_config_SCRIPTS = \ - edit-config \ -- $(NULL) -- --# Explicitly install directories to avoid permission issues due to umask + $(NULL) + + # Explicitly install directories to avoid permission issues due to umask -install-exec-local: -- $(INSTALL) -d $(DESTDIR)$(configdir) -- ++no-install-exec-local: + $(INSTALL) -d $(DESTDIR)$(configdir) + nodist_noinst_DATA = \ - netdata-openrc \ - netdata.logrotate \ diff --git a/web/Makefile.am b/web/Makefile.am -index ccaccd7..f2fed50 100644 +index ccaccd76..16a2977e 100644 --- a/web/Makefile.am +++ b/web/Makefile.am -@@ -11,10 +11,6 @@ SUBDIRS = \ - +@@ -12,7 +12,7 @@ SUBDIRS = \ usersslconfigdir=$(configdir)/ssl --# Explicitly install directories to avoid permission issues due to umask + # Explicitly install directories to avoid permission issues due to umask -install-exec-local: -- $(INSTALL) -d $(DESTDIR)$(usersslconfigdir) -- ++no-install-exec-local: + $(INSTALL) -d $(DESTDIR)$(usersslconfigdir) + dist_noinst_DATA = \ - README.md \ - gui/confluence/README.md \ +-- +2.25.0 + -- cgit 1.4.1 From 56e6074c07b83cfd04384214e06aaf20ca9f4631 Mon Sep 17 00:00:00 2001 From: Jörg Thalheim Date: Sat, 22 Feb 2020 20:21:10 +0000 Subject: netdata: fix openldap plugin --- pkgs/tools/system/netdata/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'pkgs/tools/system') diff --git a/pkgs/tools/system/netdata/default.nix b/pkgs/tools/system/netdata/default.nix index 714efb918539..482e6253a52a 100644 --- a/pkgs/tools/system/netdata/default.nix +++ b/pkgs/tools/system/netdata/default.nix @@ -1,6 +1,6 @@ { stdenv, callPackage, fetchFromGitHub, autoreconfHook, pkgconfig , CoreFoundation, IOKit, libossp_uuid -, curl, libcap, libuuid, lm_sensors, zlib +, curl, libcap, libuuid, lm_sensors, zlib, fetchpatch , withCups ? false, cups , withDBengine ? true, libuv, lz4, judy , withIpmi ? (!stdenv.isDarwin), freeipmi @@ -36,6 +36,11 @@ in stdenv.mkDerivation rec { patches = [ ./no-files-in-etc-and-var.patch + # part of the next release + (fetchpatch { + url = "https://github.com/netdata/netdata/commit/5c992b7d92cf008ce91627efccf8644732db1f87.patch"; + sha256 = "1nvbmhy5rir4kw77dhx1qr0l0wcspakr7z7ivva1ilz1aml8nbnm"; + }) ]; NIX_CFLAGS_COMPILE = optionalString withDebug "-O1 -ggdb -DNETDATA_INTERNAL_CHECKS=1"; -- cgit 1.4.1 From a47195b5168633507cc4cca00633d11f307613ea Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 25 Feb 2020 21:19:16 +0000 Subject: bfs: 1.5.2 -> 1.6 --- pkgs/tools/system/bfs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/tools/system') diff --git a/pkgs/tools/system/bfs/default.nix b/pkgs/tools/system/bfs/default.nix index 1387a6c6ed17..50146f0aad31 100644 --- a/pkgs/tools/system/bfs/default.nix +++ b/pkgs/tools/system/bfs/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "bfs"; - version = "1.5.2"; + version = "1.6"; src = fetchFromGitHub { repo = "bfs"; owner = "tavianator"; rev = version; - sha256 = "04jgah6yvz3i2bwrv1ki2nmj1yinba7djbfq8n8ism4gffsza9dz"; + sha256 = "0qrxd1vdz2crk7jf7cdda5bhm1f841hjvin7fn497wymwr5qyjah"; }; buildInputs = stdenv.lib.optionals stdenv.isLinux [ libcap acl ]; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { bfs is a variant of the UNIX find command that operates breadth-first rather than depth-first. It is otherwise intended to be compatible with many versions of find. ''; - homepage = https://github.com/tavianator/bfs; + homepage = "https://github.com/tavianator/bfs"; license = licenses.bsd0; platforms = platforms.unix; maintainers = with maintainers; [ yesbox ]; -- cgit 1.4.1