diff options
Diffstat (limited to 'pkgs/tools/system')
-rw-r--r-- | pkgs/tools/system/btop/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/system/collectd/data.nix | 10 | ||||
-rw-r--r-- | pkgs/tools/system/collectd/plugins.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/system/evemu/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/system/fakechroot/default.nix | 9 | ||||
-rw-r--r-- | pkgs/tools/system/fakeroot/default.nix | 65 | ||||
-rw-r--r-- | pkgs/tools/system/freeipmi/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/system/gdu/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/system/go-audit/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/system/gotop/default.nix | 15 | ||||
-rw-r--r-- | pkgs/tools/system/iops/default.nix | 29 | ||||
-rw-r--r-- | pkgs/tools/system/monit/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/system/netdata/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/system/thinkfan/default.nix | 4 |
14 files changed, 66 insertions, 106 deletions
diff --git a/pkgs/tools/system/btop/default.nix b/pkgs/tools/system/btop/default.nix index 7002976e3d0..c7db9e363f9 100644 --- a/pkgs/tools/system/btop/default.nix +++ b/pkgs/tools/system/btop/default.nix @@ -8,8 +8,8 @@ stdenv.mkDerivation rec { pname = "btop"; - version = "1.2.0"; - hash = "qNm0mzPPh6jYIJX1W+macIDiGyWT+0jk7O0jCmvV/S4="; + version = "1.2.3"; + hash = "sha256-vH167BL2ekWwxIhQWXkgJxl8z77S8SkmHVclW6XGc+8="; src = fetchFromGitHub { owner = "aristocratos"; diff --git a/pkgs/tools/system/collectd/data.nix b/pkgs/tools/system/collectd/data.nix index 3867bd6bb3d..52e394db40b 100644 --- a/pkgs/tools/system/collectd/data.nix +++ b/pkgs/tools/system/collectd/data.nix @@ -1,14 +1,14 @@ { stdenv, collectd }: stdenv.mkDerivation { - inherit (collectd) meta version; - pname = "collectd-data"; + inherit (collectd) meta src version; - dontUnpack = true; + dontConfigure = true; + dontBuild = true; + dontFixup = true; installPhase = '' - mkdir -p $out/share/collectd - cp ${collectd}/share/collectd/*.{db,conf} $out/share/collectd/ + install -Dm444 -t $out/share/collectd/ src/*.{db,conf} ''; } diff --git a/pkgs/tools/system/collectd/plugins.nix b/pkgs/tools/system/collectd/plugins.nix index de8948db6c9..1455feb1c32 100644 --- a/pkgs/tools/system/collectd/plugins.nix +++ b/pkgs/tools/system/collectd/plugins.nix @@ -41,8 +41,8 @@ , xen , yajl , IOKit -# Defaults to `null` for all supported plugins, -# list of plugin names for a custom build +# Defaults to `null` for all supported plugins (except xen, which is marked as +# insecure), otherwise a list of plugin names for a custom build , enabledPlugins ? null , ... }: @@ -136,7 +136,7 @@ let buildInputs = if enabledPlugins == null then builtins.concatMap pluginBuildInputs - (builtins.attrNames plugins) + (builtins.attrNames (builtins.removeAttrs plugins ["xencpu"])) else builtins.concatMap pluginBuildInputs enabledPlugins; in { inherit configureFlags buildInputs; diff --git a/pkgs/tools/system/evemu/default.nix b/pkgs/tools/system/evemu/default.nix index c01a909668e..61ef270df79 100644 --- a/pkgs/tools/system/evemu/default.nix +++ b/pkgs/tools/system/evemu/default.nix @@ -4,14 +4,14 @@ stdenv.mkDerivation rec { pname = "evemu"; - version = "2.6.0"; + version = "2.7.0"; # We could have downloaded a release tarball from cgit, but it changes hash # each time it is downloaded :/ src = fetchgit { url = "git://git.freedesktop.org/git/evemu"; rev = "refs/tags/v${version}"; - sha256 = "1m38fxwy2s82vb2qm9aqxinws12akmqqq7q66is931lc3awqkbah"; + sha256 = "sha256-SQDaARuqBMBVlUz+Nw6mjdxaZfVOukmzTlIqy8U2rus="; }; nativeBuildInputs = [ pkg-config autoreconfHook python3Packages.python ]; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { description = "Records and replays device descriptions and events to emulate input devices through the kernel's input system"; homepage = "https://www.freedesktop.org/wiki/Evemu/"; repositories.git = "git://git.freedesktop.org/git/evemu"; - license = licenses.gpl2; + license = with licenses; [ lgpl3Only gpl3Only ]; maintainers = [ maintainers.amorsillo ]; platforms = platforms.linux; }; diff --git a/pkgs/tools/system/fakechroot/default.nix b/pkgs/tools/system/fakechroot/default.nix index 382a47039ba..fd8fa04d21d 100644 --- a/pkgs/tools/system/fakechroot/default.nix +++ b/pkgs/tools/system/fakechroot/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, perl }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, nixosTests, perl }: stdenv.mkDerivation rec { pname = "fakechroot"; @@ -44,6 +44,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ perl ]; + passthru = { + tests = { + # A lightweight *unit* test that exercises fakeroot and fakechroot together: + nixos-etc = nixosTests.etc.test-etc-fakeroot; + }; + }; + meta = with lib; { homepage = "https://github.com/dex4er/fakechroot"; description = "Give a fake chroot environment through LD_PRELOAD"; diff --git a/pkgs/tools/system/fakeroot/default.nix b/pkgs/tools/system/fakeroot/default.nix index c4d3845df80..bbf0dc2b080 100644 --- a/pkgs/tools/system/fakeroot/default.nix +++ b/pkgs/tools/system/fakeroot/default.nix @@ -1,47 +1,28 @@ -{ lib, stdenv, fetchurl, fetchpatch, getopt, libcap, gnused }: +{ lib +, stdenv +, fetchurl +, fetchpatch +, getopt +, libcap +, gnused +, nixosTests +}: stdenv.mkDerivation rec { - version = "1.23"; + version = "1.27"; pname = "fakeroot"; src = fetchurl { - url = "http://http.debian.net/debian/pool/main/f/fakeroot/fakeroot_${version}.orig.tar.xz"; - sha256 = "1xpl0s2yjyjwlf832b6kbkaa5921liybaar13k7n45ckd9lxd700"; + url = "http://http.debian.net/debian/pool/main/f/fakeroot/fakeroot_${version}.orig.tar.gz"; + sha256 = "1p5d3jq6l1pzk96agkf05dck7dbgvldx5sg2d4h7d8h230nyni9w"; }; patches = lib.optionals stdenv.isLinux [ ./einval.patch - - # glibc 2.33 patches from ArchLinux - (fetchpatch { - url = "https://raw.githubusercontent.com/archlinux/svntogit-packages/15b01cf37ff64c487f7440df4e09b090cd93b58f/fakeroot/trunk/fakeroot-1.25.3-glibc-2.33-fix-1.patch"; - sha256 = "sha256-F6BcxYInSLu7Fxg6OmMZDhTWoLqsc//yYPlTZqQQl68="; - }) - (fetchpatch { - url = "https://raw.githubusercontent.com/archlinux/svntogit-packages/15b01cf37ff64c487f7440df4e09b090cd93b58f/fakeroot/trunk/fakeroot-1.25.3-glibc-2.33-fix-2.patch"; - sha256 = "sha256-ifpJxhk6MyQpFolC1hIAAUjcHmOHVU1D25tRwpu2S/k="; - }) - (fetchpatch { - url = "https://raw.githubusercontent.com/archlinux/svntogit-packages/15b01cf37ff64c487f7440df4e09b090cd93b58f/fakeroot/trunk/fakeroot-1.25.3-glibc-2.33-fix-3.patch"; - sha256 = "sha256-o2Xm4C64Ny9TL8fjsZltjO1CdJ4VGwqZ+LnufVL5Sq8="; - }) - ] - # patchset from brew - ++ lib.optionals stdenv.isDarwin [ (fetchpatch { - name = "0001-Implement-openat-2-wrapper-which-handles-optional-ar.patch"; - url = "https://bugs.debian.org/cgi-bin/bugreport.cgi?msg=5;filename=0001-Implement-openat-2-wrapper-which-handles-optional-ar.patch;att=1;bug=766649"; - sha256 = "1m6ggrqwqy0in264sxqk912vniipiw629dxq7kibakvsswfk6bkk"; - }) - (fetchpatch { - name = "0002-OS-X-10.10-introduced-id_t-int-in-gs-etpriority.patch"; - url = "https://bugs.debian.org/cgi-bin/bugreport.cgi?msg=5;filename=0002-OS-X-10.10-introduced-id_t-int-in-gs-etpriority.patch;att=2;bug=766649"; - sha256 = "0rhayp42x4i1a6yc4d28kpshmf7lrmaprq64zfrjpdn4kbs0rkln"; - }) - (fetchpatch { - name = "fakeroot-always-pass-mode.patch"; - url = "https://bugs.debian.org/cgi-bin/bugreport.cgi?att=2;bug=766649;filename=fakeroot-always-pass-mode.patch;msg=20"; - sha256 = "0i3zaca1v449dm9m1cq6wq4dy6hc2y04l05m9gg8d4y4swld637p"; + name = "also-wrap-stat-library-call.patch"; + url = "https://sources.debian.org/data/main/f/fakeroot/1.27-1/debian/patches/also-wrap-stat-library-call.patch"; + sha256 = "0p7lq6m31k3rqsnjbi06a8ykdqa3cp4y5ngsjyk3q1269gx59x8b"; }) ]; @@ -53,17 +34,12 @@ stdenv.mkDerivation rec { sed -i -e "s@getopt@$(type -p getopt)@g" -e "s@sed@$(type -p sed)@g" ${pname}-${version}/scripts/fakeroot.in ''; - postConfigure = let - # additional patch from brew, but needs to be applied to a generated file - patch-wraptmpf = fetchpatch { - name = "fakeroot-patch-wraptmpf-h.patch"; - url = "https://bugs.debian.org/cgi-bin/bugreport.cgi?att=3;bug=766649;filename=fakeroot-patch-wraptmpf-h.patch;msg=20"; - sha256 = "1jhsi4bv6nnnjb4vmmmbhndqg719ckg860hgw98bli8m05zwbx6a"; + passthru = { + tests = { + # A lightweight *unit* test that exercises fakeroot and fakechroot together: + nixos-etc = nixosTests.etc.test-etc-fakeroot; }; - in lib.optional stdenv.isDarwin '' - make wraptmpf.h - patch -p1 < ${patch-wraptmpf} - ''; + }; meta = { homepage = "https://salsa.debian.org/clint/fakeroot"; @@ -72,5 +48,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [viric]; platforms = lib.platforms.unix; }; - } diff --git a/pkgs/tools/system/freeipmi/default.nix b/pkgs/tools/system/freeipmi/default.nix index a3bb99735a1..09b7b312799 100644 --- a/pkgs/tools/system/freeipmi/default.nix +++ b/pkgs/tools/system/freeipmi/default.nix @@ -1,12 +1,12 @@ { fetchurl, lib, stdenv, libgcrypt, readline, libgpg-error }: stdenv.mkDerivation rec { - version = "1.6.8"; + version = "1.6.9"; pname = "freeipmi"; src = fetchurl { url = "mirror://gnu/freeipmi/${pname}-${version}.tar.gz"; - sha256 = "0w8af1i57szmxl9vfifwwyal7xh8aixz2l9487wvy6yckqk6m92a"; + sha256 = "sha256-8l4cNfPQ8bWpnMMezCNTyoPtRqFRY4QvuocBJ9ycggY="; }; buildInputs = [ libgcrypt readline libgpg-error ]; diff --git a/pkgs/tools/system/gdu/default.nix b/pkgs/tools/system/gdu/default.nix index ec94a9f337f..4204bf8994b 100644 --- a/pkgs/tools/system/gdu/default.nix +++ b/pkgs/tools/system/gdu/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "gdu"; - version = "5.13.0"; + version = "5.13.2"; src = fetchFromGitHub { owner = "dundee"; repo = pname; rev = "v${version}"; - sha256 = "sha256-yOYwPr/Yz/PGpCZtv/dWVFgll6VM7wQEtU/jEVpMjlE="; + sha256 = "sha256-2HADEp1nDkIl56e5oxY6bC+lRWanQwjlCChm0aI0N9Q="; }; vendorSha256 = "sha256-9+Zez33oET0nx/Xm3fXh1WFoQduMBodvml1oGO6jUYc="; @@ -45,7 +45,7 @@ buildGoModule rec { ''; homepage = "https://github.com/dundee/gdu"; license = with licenses; [ mit ]; - maintainers = [ maintainers.fab ]; + maintainers = [ maintainers.fab maintainers.zowoq ]; platforms = platforms.unix; }; } diff --git a/pkgs/tools/system/go-audit/default.nix b/pkgs/tools/system/go-audit/default.nix index 9670a4d0684..e9c74e0b981 100644 --- a/pkgs/tools/system/go-audit/default.nix +++ b/pkgs/tools/system/go-audit/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "go-audit"; - version = "1.0.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "slackhq"; repo = pname; rev = "v${version}"; - sha256 = "02iwjzaz2ks0zmwijaijwzc3gn9mhn7xpx369ylgaz68arlapfjg"; + sha256 = "sha256-iJm33IZ3kGWnGVDVbQCTvoo+dXBU5092YYXZG+Z7vi0="; }; - vendorSha256 = "11kb7xm82s0d8d06b2jknwn3dfh4i0a1dv0740y47vk62sf6f05i"; + vendorSha256 = "sha256-sQBnnBZm7kM8IAfsFhSIBLo2LLdTimVAQw1ogWo/a4Y="; # Tests need network access doCheck = false; diff --git a/pkgs/tools/system/gotop/default.nix b/pkgs/tools/system/gotop/default.nix index 3edc6d4694a..f2da1c788a4 100644 --- a/pkgs/tools/system/gotop/default.nix +++ b/pkgs/tools/system/gotop/default.nix @@ -1,27 +1,34 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, stdenv, buildGoModule, fetchFromGitHub, installShellFiles }: buildGoModule rec { pname = "gotop"; - version = "4.1.2"; + version = "4.1.3"; src = fetchFromGitHub { owner = "xxxserxxx"; repo = pname; rev = "v${version}"; - sha256 = "15bsxaxqxp17wsr0p9fkpvgfyqnhhwm3j8jxkvcs4cdw73qaxdsy"; + hash = "sha256-oDM+dpAT1vDpp2NkD669hwbgw7HWJGFqhsql9PvbxSk="; }; proxyVendor = true; - vendorSha256 = "sha256-WwHaprq4+4uduiKpNu5iVcV6qJsYX/aSXJAJWpbDVqc="; + vendorSha256 = "sha256-WGLcpF1NqVQDiU3M9rQ555ZW3sDC3Szch+skTZgt0xg="; ldflags = [ "-s" "-w" "-X main.Version=v${version}" ]; + nativeBuildInputs = [ installShellFiles ]; + preCheck = '' export HOME=$(mktemp -d) ''; doCheck = !stdenv.isDarwin; + postInstall = '' + $out/bin/gotop --create-manpage > gotop.1 + installManPage gotop.1 + ''; + meta = with lib; { description = "A terminal based graphical activity monitor inspired by gtop and vtop"; homepage = "https://github.com/xxxserxxx/gotop"; diff --git a/pkgs/tools/system/iops/default.nix b/pkgs/tools/system/iops/default.nix deleted file mode 100644 index b2be488673e..00000000000 --- a/pkgs/tools/system/iops/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib, stdenv, fetchurl }: - -stdenv.mkDerivation rec { - pname = "iops"; - version = "0.1"; - - src = fetchurl { - url = "https://www.vanheusden.com/iops/${pname}-${version}.tgz"; - sha256 = "1knih6dwwiicycp5ml09bj3k8j7air9bng070sfnxwfv786y90bz"; - }; - - installPhase = '' - mkdir -p $out/bin - cp iops $out/bin - ''; - - meta = with lib; { - description = "Measure I/O operations per second of a storage device"; - longDescription = '' - Iops lets you measure how many I/O operations per second a storage device can perform. - Usefull for determing e.g. the best RAID-setting of your storage device. - ''; - homepage = "http://www.vanheusden.com/iops/"; - license = licenses.gpl2; - maintainers = with maintainers; [ davidak ]; - platforms = platforms.linux; # build problems on Darwin - }; -} - diff --git a/pkgs/tools/system/monit/default.nix b/pkgs/tools/system/monit/default.nix index 93cdbe6d546..96c1c91591d 100644 --- a/pkgs/tools/system/monit/default.nix +++ b/pkgs/tools/system/monit/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { pname = "monit"; - version = "5.29.0"; + version = "5.30.0"; src = fetchurl { url = "${meta.homepage}dist/monit-${version}.tar.gz"; - sha256 = "sha256-9mXm3R8mp0tWgomah3k0Fn3islguBIZS7PA2MYR3iF8="; + sha256 = "sha256-6FZJ36hYb0/N00oClcVd3Wmw7abPvaxHEFomc9ELEAg="; }; nativeBuildInputs = [ bison flex ]; diff --git a/pkgs/tools/system/netdata/default.nix b/pkgs/tools/system/netdata/default.nix index 1b04abce0e0..79f829ffdfb 100644 --- a/pkgs/tools/system/netdata/default.nix +++ b/pkgs/tools/system/netdata/default.nix @@ -16,14 +16,14 @@ with lib; let go-d-plugin = callPackage ./go.d.plugin.nix {}; in stdenv.mkDerivation rec { - version = "1.32.1"; + version = "1.33.1"; pname = "netdata"; src = fetchFromGitHub { owner = "netdata"; repo = "netdata"; rev = "v${version}"; - sha256 = "sha256-DbuR3x7d6synJELOxI+frK4LY9zFgPKmY7hGY8B5z7o="; + sha256 = "sha256-4rx8EHtOSd/lHcSHZCtiXkjJjL7B175cVGvFOZ9Bzi8="; fetchSubmodules = true; }; diff --git a/pkgs/tools/system/thinkfan/default.nix b/pkgs/tools/system/thinkfan/default.nix index 8da87ecfa71..a564c946bcf 100644 --- a/pkgs/tools/system/thinkfan/default.nix +++ b/pkgs/tools/system/thinkfan/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "thinkfan"; - version = "1.3.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "vmatare"; repo = "thinkfan"; rev = version; - sha256 = "sha256-ZCZqi7A4qdWtDSkTw6ktHIZnPhdes2AX7+QBroaDDfI="; + sha256 = "sha256-aREZv+t4QhtfLKOMrneLiRxgnu0fzB8UV8dvr1dnhx4="; }; postPatch = '' |