diff options
Diffstat (limited to 'nixpkgs/pkgs/tools/system')
19 files changed, 76 insertions, 65 deletions
diff --git a/nixpkgs/pkgs/tools/system/collectd/default.nix b/nixpkgs/pkgs/tools/system/collectd/default.nix index 3fdc87808881..d71fa0c4e584 100644 --- a/nixpkgs/pkgs/tools/system/collectd/default.nix +++ b/nixpkgs/pkgs/tools/system/collectd/default.nix @@ -13,7 +13,7 @@ , libmemcached, cyrus_sasl , libmicrohttpd , libmodbus -, libnotify, gdk_pixbuf +, libnotify, gdk-pixbuf , liboping , libpcap , libsigrok @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig autoreconfHook ]; buildInputs = [ curl libdbi libgcrypt libmemcached - cyrus_sasl libnotify gdk_pixbuf liboping libpcap libvirt + cyrus_sasl libnotify gdk-pixbuf liboping libpcap libvirt libxml2 postgresql protobufc rrdtool varnish yajl jdk libtool python hiredis libmicrohttpd riemann_c_client mosquitto rdkafka mongoc diff --git a/nixpkgs/pkgs/tools/system/colorls/default.nix b/nixpkgs/pkgs/tools/system/colorls/default.nix index 45c3bdf1f40c..62670fa11a08 100644 --- a/nixpkgs/pkgs/tools/system/colorls/default.nix +++ b/nixpkgs/pkgs/tools/system/colorls/default.nix @@ -1,4 +1,4 @@ -{ lib, bundlerApp, ruby, ... }: +{ lib, bundlerApp, ruby, bundlerUpdateScript }: bundlerApp rec { pname = "colorls"; @@ -6,11 +6,13 @@ bundlerApp rec { gemdir = ./.; exes = [ "colorls" ]; + passthru.updateScript = bundlerUpdateScript "colorls"; + meta = with lib; { description = "Prettified LS"; homepage = https://github.com/athityakumar/colorls; license = with licenses; mit; - maintainers = with maintainers; [ lukebfox ]; + maintainers = with maintainers; [ lukebfox nicknovitski ]; platforms = ruby.meta.platforms; }; } diff --git a/nixpkgs/pkgs/tools/system/ddrescueview/default.nix b/nixpkgs/pkgs/tools/system/ddrescueview/default.nix index 517cefb6a2b3..466232e2bf77 100644 --- a/nixpkgs/pkgs/tools/system/ddrescueview/default.nix +++ b/nixpkgs/pkgs/tools/system/ddrescueview/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, fpc, lazarus, atk, cairo, gdk_pixbuf, glib, gtk2, libX11, pango }: +{ stdenv, lib, fetchurl, fpc, lazarus, atk, cairo, gdk-pixbuf, glib, gtk2, libX11, pango }: stdenv.mkDerivation rec { name = "ddrescueview-0.4alpha3"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ fpc lazarus ]; - buildInputs = [ atk cairo gdk_pixbuf glib gtk2 libX11 pango ]; + buildInputs = [ atk cairo gdk-pixbuf glib gtk2 libX11 pango ]; sourceRoot = "source"; diff --git a/nixpkgs/pkgs/tools/system/fakechroot/default.nix b/nixpkgs/pkgs/tools/system/fakechroot/default.nix index 25470af9bb30..77ba6689b0d4 100644 --- a/nixpkgs/pkgs/tools/system/fakechroot/default.nix +++ b/nixpkgs/pkgs/tools/system/fakechroot/default.nix @@ -1,17 +1,28 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, perl }: +{ stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, perl }: stdenv.mkDerivation rec { - name = "fakechroot-${version}"; - version = "2.19"; + pname = "fakechroot"; + version = "2.20.1"; - # TODO: move back to mainline once https://github.com/dex4er/fakechroot/pull/46 is merged src = fetchFromGitHub { - owner = "copumpkin"; - repo = "fakechroot"; - rev = "dcc0cfe3941e328538f9e62b2c0b15430d393ec1"; - sha256 = "1ls3y97qqfcfd3z0balz94xq1gskfk04pg85x6b7wjw8dm4030qd"; + owner = "dex4er"; + repo = pname; + rev = version; + sha256 = "0xgnwazrmrg4gm30xjxdn6sx3lhqvxahrh6gmy3yfswxc30pmg86"; }; + # Use patch from https://github.com/dex4er/fakechroot/pull/46 , remove once merged! + # Courtesy of one of our own, @copumpkin! + patches = [ + (fetchpatch { + url = "https://github.com/dex4er/fakechroot/pull/46/commits/dcc0cfe3941e328538f9e62b2c0b15430d393ec1.patch"; + sha256 = "1mk8j2njd94s7vf2wggi08xxxzx8dxrvdricl9cbspvkyp715w2m"; + # Don't bother trying to reconcile conflicts for NEWS entries, as they will continue to occur + # and are uninteresting as well as unimportant for our purposes (since NEWS never leaves the build env). + excludes = [ "NEWS.md" ]; + }) + ]; + nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ perl ]; diff --git a/nixpkgs/pkgs/tools/system/fio/default.nix b/nixpkgs/pkgs/tools/system/fio/default.nix index 6dfc0991ed36..694a71d8ec11 100644 --- a/nixpkgs/pkgs/tools/system/fio/default.nix +++ b/nixpkgs/pkgs/tools/system/fio/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "fio-${version}"; - version = "3.14"; + version = "3.15"; src = fetchFromGitHub { owner = "axboe"; repo = "fio"; rev = "fio-${version}"; - sha256 = "1qpv9saar0ik9mqpdyv93miyllfn7n7czcpffhk13lcrxasmjcp9"; + sha256 = "0wzy5byc2qx5mbnwkcyjkrzc662n4wkrzpcg4h611q4ix494zka9"; }; buildInputs = [ python zlib ] diff --git a/nixpkgs/pkgs/tools/system/hiera-eyaml/Gemfile b/nixpkgs/pkgs/tools/system/hiera-eyaml/Gemfile index 18c7cde2a086..2c2e8f27e403 100644 --- a/nixpkgs/pkgs/tools/system/hiera-eyaml/Gemfile +++ b/nixpkgs/pkgs/tools/system/hiera-eyaml/Gemfile @@ -1,3 +1,3 @@ source 'https://rubygems.org' -gem 'hiera-eyaml', '2.1.0' +gem 'hiera-eyaml' diff --git a/nixpkgs/pkgs/tools/system/hiera-eyaml/Gemfile.lock b/nixpkgs/pkgs/tools/system/hiera-eyaml/Gemfile.lock index a6d1c1f872e9..259c2e170b0e 100644 --- a/nixpkgs/pkgs/tools/system/hiera-eyaml/Gemfile.lock +++ b/nixpkgs/pkgs/tools/system/hiera-eyaml/Gemfile.lock @@ -1,17 +1,17 @@ GEM remote: https://rubygems.org/ specs: - hiera-eyaml (2.1.0) + hiera-eyaml (3.0.0) highline (~> 1.6.19) - trollop (~> 2.0) + optimist highline (1.6.21) - trollop (2.1.2) + optimist (3.0.0) PLATFORMS ruby DEPENDENCIES - hiera-eyaml (= 2.1.0) + hiera-eyaml BUNDLED WITH - 1.11.2 + 1.17.2 diff --git a/nixpkgs/pkgs/tools/system/hiera-eyaml/default.nix b/nixpkgs/pkgs/tools/system/hiera-eyaml/default.nix index e0ff7d5ca8b4..33d97aa7d6b6 100644 --- a/nixpkgs/pkgs/tools/system/hiera-eyaml/default.nix +++ b/nixpkgs/pkgs/tools/system/hiera-eyaml/default.nix @@ -1,15 +1,17 @@ -{ lib, bundlerEnv, ruby }: +{ lib, bundlerEnv, ruby, bundlerUpdateScript }: bundlerEnv { inherit ruby; pname = "hiera-eyaml"; gemdir = ./.; + passthru.updateScript = bundlerUpdateScript "hiera-eyaml"; + meta = with lib; { description = "Per-value asymmetric encryption of sensitive data for Hiera"; homepage = https://github.com/TomPoulton/hiera-eyaml; license = licenses.mit; - maintainers = [ maintainers.benley ]; + maintainers = with maintainers; [ benley nicknovitski ]; platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/tools/system/hiera-eyaml/gemset.nix b/nixpkgs/pkgs/tools/system/hiera-eyaml/gemset.nix index ab6d5307ebb8..d5aa722e5fce 100644 --- a/nixpkgs/pkgs/tools/system/hiera-eyaml/gemset.nix +++ b/nixpkgs/pkgs/tools/system/hiera-eyaml/gemset.nix @@ -1,11 +1,14 @@ { hiera-eyaml = { + dependencies = ["highline" "optimist"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1h25pfv89macjf3sjdrx7slhlq1af4zybai42ci3gj02b6hli4a6"; + sha256 = "049rxnwyivqgyjl0sjg7cb2q44ic0wsml288caspd1ps8v31gl18"; type = "gem"; }; - version = "2.1.0"; + version = "3.0.0"; }; highline = { source = { @@ -15,12 +18,14 @@ }; version = "1.6.21"; }; - trollop = { + optimist = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0415y63df86sqj43c0l82and65ia5h64if7n0znkbrmi6y0jwhl8"; + sha256 = "05jxrp3nbn5iilc1k7ir90mfnwc5abc9h78s5rpm3qafwqxvcj4j"; type = "gem"; }; - version = "2.1.2"; + version = "3.0.0"; }; } \ No newline at end of file diff --git a/nixpkgs/pkgs/tools/system/hwinfo/default.nix b/nixpkgs/pkgs/tools/system/hwinfo/default.nix index ff9376380569..eba8c8f41b49 100644 --- a/nixpkgs/pkgs/tools/system/hwinfo/default.nix +++ b/nixpkgs/pkgs/tools/system/hwinfo/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "hwinfo-${version}"; - version = "21.66"; + version = "21.67"; src = fetchFromGitHub { owner = "opensuse"; repo = "hwinfo"; rev = "${version}"; - sha256 = "1f841hzh9ik02690h9b1k3ysqv91avsb0zir2ykqz8qj39c5qsxz"; + sha256 = "1fvlrqx1wgl79a9j3xhhhdihj4lkpbrchfsc27il0p52fynn4dji"; }; patchPhase = '' diff --git a/nixpkgs/pkgs/tools/system/inxi/default.nix b/nixpkgs/pkgs/tools/system/inxi/default.nix index badc36650f0d..c869c4b11a5c 100644 --- a/nixpkgs/pkgs/tools/system/inxi/default.nix +++ b/nixpkgs/pkgs/tools/system/inxi/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "inxi-${version}"; - version = "3.0.34-1"; + version = "3.0.35-1"; src = fetchFromGitHub { owner = "smxi"; repo = "inxi"; rev = version; - sha256 = "0x2s40lwsan2pk292nspjgyw00f9f5fdfmwfvl50924pxhyxn2fh"; + sha256 = "1rvidz2b9zp3ikkcjf8zr5r8r9mxnw3zgly2pvlim11kkp76zdl9"; }; buildInputs = [ perl ]; diff --git a/nixpkgs/pkgs/tools/system/monit/default.nix b/nixpkgs/pkgs/tools/system/monit/default.nix index 282729f31459..f4238e272480 100644 --- a/nixpkgs/pkgs/tools/system/monit/default.nix +++ b/nixpkgs/pkgs/tools/system/monit/default.nix @@ -6,11 +6,11 @@ }: stdenv.mkDerivation rec { - name = "monit-5.25.3"; + name = "monit-5.26.0"; src = fetchurl { url = "${meta.homepage}dist/${name}.tar.gz"; - sha256 = "0s8577ixcmx45b081yx6cw54iq7m5yzpq3ir616qc84xhg45h0n1"; + sha256 = "1hpk0agxi7g9vmfqvrwr5wk7pr52wdlv3vs0j3l2p6mgldl4bz47"; }; nativeBuildInputs = [ bison flex ]; diff --git a/nixpkgs/pkgs/tools/system/osquery/default.nix b/nixpkgs/pkgs/tools/system/osquery/default.nix index 80341e88dd06..c34b53c1e62d 100644 --- a/nixpkgs/pkgs/tools/system/osquery/default.nix +++ b/nixpkgs/pkgs/tools/system/osquery/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub, pkgconfig, cmake, python , udev, audit, aws-sdk-cpp, cryptsetup, lvm2, libgcrypt, libarchive , libgpgerror, libuuid, iptables, dpkg, lzma, bzip2, rpm -, beecrypt, augeas, libxml2, sleuthkit, yara, lldpd, google-gflags +, beecrypt, augeas, libxml2, sleuthkit, yara, lldpd, gflags , thrift, boost, rocksdb_lite, glog, gbenchmark, snappy , openssl, file, doxygen , gtest, fpm, zstd, rdkafka, rapidjson, fetchgit, fetchurl, libelfin @@ -53,7 +53,7 @@ let # filter out static linking configuration to avoid that the library will # be linked both statically and dynamically. - gflags = google-gflags.overrideAttrs (old: { + gflags = gflags.overrideAttrs (old: { cmakeFlags = stdenv.lib.filter (f: (builtins.match ".*STATIC.*" f) == null) old.cmakeFlags; }); }; diff --git a/nixpkgs/pkgs/tools/system/procodile/default.nix b/nixpkgs/pkgs/tools/system/procodile/default.nix index 22dc59a9e8e6..3ae80a312ed6 100644 --- a/nixpkgs/pkgs/tools/system/procodile/default.nix +++ b/nixpkgs/pkgs/tools/system/procodile/default.nix @@ -1,15 +1,17 @@ -{ lib, bundlerApp }: +{ lib, bundlerApp, bundlerUpdateScript }: bundlerApp { pname = "procodile"; gemdir = ./.; exes = [ "procodile" ]; + passthru.updateScript = bundlerUpdateScript "procodile"; + meta = with lib; { description = "Run processes in the background (and foreground) on Mac & Linux from a Procfile (for production and/or development environments)"; homepage = https://adam.ac/procodile; license = with licenses; mit; - maintainers = with maintainers; [ ravloony manveru ]; + maintainers = with maintainers; [ ravloony manveru nicknovitski ]; platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/tools/system/r10k/default.nix b/nixpkgs/pkgs/tools/system/r10k/default.nix index 43d354107609..56e4e4f94fae 100644 --- a/nixpkgs/pkgs/tools/system/r10k/default.nix +++ b/nixpkgs/pkgs/tools/system/r10k/default.nix @@ -1,4 +1,4 @@ -{ lib, bundlerApp, makeWrapper, git, gnutar, gzip }: +{ lib, bundlerApp, bundlerUpdateScript, makeWrapper, git, gnutar, gzip }: bundlerApp { pname = "r10k"; @@ -11,11 +11,13 @@ bundlerApp { wrapProgram $out/bin/r10k --prefix PATH : ${lib.makeBinPath [ git gnutar gzip ]} ''; + passthru.updateScript = bundlerUpdateScript "r10k"; + meta = with lib; { description = "Puppet environment and module deployment"; homepage = https://github.com/puppetlabs/r10k; license = licenses.asl20; - maintainers = with maintainers; [ zimbatm manveru ]; + maintainers = with maintainers; [ zimbatm manveru nicknovitski ]; platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/tools/system/rsyslog/default.nix b/nixpkgs/pkgs/tools/system/rsyslog/default.nix index 729a90aa317e..2899837f3f88 100644 --- a/nixpkgs/pkgs/tools/system/rsyslog/default.nix +++ b/nixpkgs/pkgs/tools/system/rsyslog/default.nix @@ -11,11 +11,11 @@ let mkFlag = cond: name: if cond then "--enable-${name}" else "--disable-${name}"; in stdenv.mkDerivation rec { - name = "rsyslog-8.1905.0"; + name = "rsyslog-8.1907.0"; src = fetchurl { url = "https://www.rsyslog.com/files/download/rsyslog/${name}.tar.gz"; - sha256 = "1r0nf5j4y8p1hbay3kdgkggr76qm7sw10pnl4anxd3vninmlzgcn"; + sha256 = "1dcz0w5xalqsi2xjb5j7c9mq5kf9s9kq9j2inpv4w5wkrrg569zb"; }; #patches = [ ./fix-gnutls-detection.patch ]; diff --git a/nixpkgs/pkgs/tools/system/stress-ng/default.nix b/nixpkgs/pkgs/tools/system/stress-ng/default.nix index 08f7f3039fb5..5d5d3b1939db 100644 --- a/nixpkgs/pkgs/tools/system/stress-ng/default.nix +++ b/nixpkgs/pkgs/tools/system/stress-ng/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "stress-ng"; - version = "0.09.59.1"; + version = "0.10.00"; src = fetchurl { url = "https://kernel.ubuntu.com/~cking/tarballs/${pname}/${pname}-${version}.tar.xz"; - sha256 = "0f3a6ki9v8lw4m9cwzlxsy7ykzmckgydnj2vypvwlr7rxcs19hxl"; + sha256 = "0x602d9alilxxx2v59ryyg6s81l9nf8bxyavk5wf8jd5mshx57fh"; }; # All platforms inputs then Linux-only ones diff --git a/nixpkgs/pkgs/tools/system/systemd-journal2gelf/default.nix b/nixpkgs/pkgs/tools/system/systemd-journal2gelf/default.nix index 7230f55d309c..2219d623a039 100644 --- a/nixpkgs/pkgs/tools/system/systemd-journal2gelf/default.nix +++ b/nixpkgs/pkgs/tools/system/systemd-journal2gelf/default.nix @@ -1,19 +1,17 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { - name = "SystemdJournal2Gelf-${version}"; - version = "20170413"; - - goPackagePath = "github.com/parse-nl/SystemdJournal2Gelf"; +buildGoModule rec { + pname = "SystemdJournal2Gelf-unstable"; + version = "20190702"; src = fetchFromGitHub { - rev = "862b1d60d2ba12cd8480304ca95041066cc8bdd0"; + rev = "b1aa5ff31307d11a3c9b4dd08c3cd6230d935ec5"; owner = "parse-nl"; repo = "SystemdJournal2Gelf"; - sha256 = "0xvvc7w2sxkhb33nkq5v626l673d5j2z0yc75wvmqzncwfkkv94v"; + sha256 = "0i2pv817fjm2xazxb01dk2gg1xb4d9b6743gqrbsyghbkm7krx29"; }; - goDeps = ./deps.nix; + modSha256 = "0f66bjij3bkjs09xhhp26arivlqrd66z1j5ziy4lq4krg82krsdp"; meta = with stdenv.lib; { description = "Export entries from systemd's journal and send them to a graylog server using gelf"; diff --git a/nixpkgs/pkgs/tools/system/systemd-journal2gelf/deps.nix b/nixpkgs/pkgs/tools/system/systemd-journal2gelf/deps.nix deleted file mode 100644 index 2e0988e81054..000000000000 --- a/nixpkgs/pkgs/tools/system/systemd-journal2gelf/deps.nix +++ /dev/null @@ -1,11 +0,0 @@ -[ -{ - goPackagePath = "github.com/DECK36/go-gelf"; - fetch = { - type = "git"; - url = "https://github.com/DECK36/go-gelf"; - rev = "4bc6123df0946a1c23fd54e0c1d0ed68b44fd99f"; - sha256 = "071zdwcl8ld05gv88yym1p7xq72igd6jj05n5d7v01hn6rvj48ay"; - }; -} -] |