diff options
Diffstat (limited to 'pkgs/tools/system')
-rw-r--r-- | pkgs/tools/system/bottom/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/system/collectd/data.nix | 10 | ||||
-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/goreman/default.nix | 24 | ||||
-rw-r--r-- | pkgs/tools/system/gotop/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/system/iops/default.nix | 29 | ||||
-rw-r--r-- | pkgs/tools/system/proot/default.nix | 13 | ||||
-rw-r--r-- | pkgs/tools/system/thinkfan/default.nix | 4 |
9 files changed, 58 insertions, 104 deletions
diff --git a/pkgs/tools/system/bottom/default.nix b/pkgs/tools/system/bottom/default.nix index 6a6ae20dfa9..766b5afd4e6 100644 --- a/pkgs/tools/system/bottom/default.nix +++ b/pkgs/tools/system/bottom/default.nix @@ -11,13 +11,13 @@ rustPlatform.buildRustPackage rec { pname = "bottom"; - version = "0.6.6"; + version = "0.6.8"; src = fetchFromGitHub { owner = "ClementTsang"; repo = pname; rev = version; - sha256 = "sha256-nE718NA3oLkBTTjewypYyUVRgTm4xiDTui5kEPYYCBc="; + sha256 = "sha256-zmiYVLaXKHH+MObO75wOiGkDetKy4bVLe7IAqiO2ER8="; }; prePatch = '' @@ -33,7 +33,7 @@ rustPlatform.buildRustPackage rec { libiconv ]; - cargoSha256 = "sha256-M6LgriXjhxlnoky+TNU7Eb15M+uTgbVKk3g/Sk90xsg="; + cargoSha256 = "sha256-GMG6YBm/jA5D7wxC2gczMn/6Lkqiq/toSPNf86kgOys="; doCheck = false; 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/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/goreman/default.nix b/pkgs/tools/system/goreman/default.nix index 22918f14145..9613ab8d650 100644 --- a/pkgs/tools/system/goreman/default.nix +++ b/pkgs/tools/system/goreman/default.nix @@ -1,18 +1,27 @@ -{ lib, buildGoPackage, fetchFromGitHub }: -buildGoPackage rec { - pname = "goreman"; - version = "0.2.1"; +{ lib, buildGoModule, fetchFromGitHub }: - goPackagePath = "github.com/mattn/goreman"; - subPackages = ["."]; +buildGoModule rec { + pname = "goreman"; + version = "0.3.9"; + rev = "df1209e7cdbad10aecc0aa75d332bc32822925f5"; src = fetchFromGitHub { owner = "mattn"; repo = "goreman"; rev = "v${version}"; - sha256 = "1h7ip788j7bkygahpp7ylgnrx9jrbhwjzqpjhd1pflmlaxcbflcy"; + sha256 = "1irjf5i5ybdchyn42bamfq8pj3w00p633h1gg202n0vsr39h0bxw"; }; + ldflags = [ + "-s" + "-w" + "-X main.revision=${builtins.substring 0 7 rev}" + ]; + + vendorSha256 = "sha256-+RFh6Ppxxs7P7DWqOBeEJTvPsBgOfopMjx22hPEI1/U="; + + doCheck = false; + meta = with lib; { description = "foreman clone written in go language"; homepage = "https://github.com/mattn/goreman"; @@ -20,4 +29,3 @@ buildGoPackage rec { maintainers = with maintainers; [ zimbatm ]; }; } - diff --git a/pkgs/tools/system/gotop/default.nix b/pkgs/tools/system/gotop/default.nix index 7fc247c8a57..3edc6d4694a 100644 --- a/pkgs/tools/system/gotop/default.nix +++ b/pkgs/tools/system/gotop/default.nix @@ -12,7 +12,7 @@ buildGoModule rec { }; proxyVendor = true; - vendorSha256 = "sha256-c+9IZEKiW95JIh6krs9NhdBohUatTTEIYBU13kj9zB8="; + vendorSha256 = "sha256-WwHaprq4+4uduiKpNu5iVcV6qJsYX/aSXJAJWpbDVqc="; ldflags = [ "-s" "-w" "-X main.Version=v${version}" ]; 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/proot/default.nix b/pkgs/tools/system/proot/default.nix index cf5a845827f..d11cd8382c9 100644 --- a/pkgs/tools/system/proot/default.nix +++ b/pkgs/tools/system/proot/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch +{ lib, stdenv, fetchFromGitHub , talloc , pkg-config , libarchive @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "proot"; - version = "5.2.0"; + version = "5.3.0"; src = fetchFromGitHub { repo = "proot"; owner = "proot-me"; rev = "v${version}"; - sha256 = "1ir3a7rp9rvpv9i8gjrkr383sqadgl7f9nflcrfg7q05bxapwiws"; + sha256 = "sha256-89d1a5QBusra0vd3Ph0lQalXrblBwogi6bNgvvpQL+Q="; }; postPatch = '' @@ -26,13 +26,6 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses libarchive talloc ] ++ lib.optional enablePython python3; nativeBuildInputs = [ pkg-config docutils ] ++ lib.optional enablePython swig; - patches = [ - # without this patch the package does not build with python>3.7 - (fetchpatch { - url = "https://github.com/proot-me/proot/pull/285.patch"; - sha256= "1vncq36pr4v0h63fijga6zrwlsb0vb4pj25zxf1ni15ndxv63pxj"; - }) - ]; enableParallelBuilding = 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 = '' |