diff options
Diffstat (limited to 'pkgs/tools/system')
67 files changed, 194 insertions, 701 deletions
diff --git a/pkgs/tools/system/actkbd/default.nix b/pkgs/tools/system/actkbd/default.nix index 7f8058433a1d8..175e405155d43 100644 --- a/pkgs/tools/system/actkbd/default.nix +++ b/pkgs/tools/system/actkbd/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "A keyboard shortcut daemon"; + description = "Keyboard shortcut daemon"; longDescription = '' actkbd is a simple daemon that binds actions to keyboard events directly on evdev interface (that is, no X11 required). It diff --git a/pkgs/tools/system/at/default.nix b/pkgs/tools/system/at/default.nix index e5eebb727b54f..5990bf4c08fa3 100644 --- a/pkgs/tools/system/at/default.nix +++ b/pkgs/tools/system/at/default.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "The classical Unix `at' job scheduling command"; + description = "Classical Unix `at' job scheduling command"; license = licenses.gpl2Plus; homepage = "https://tracker.debian.org/pkg/at"; changelog = "https://salsa.debian.org/debian/at/-/raw/master/ChangeLog"; diff --git a/pkgs/tools/system/auto-cpufreq/default.nix b/pkgs/tools/system/auto-cpufreq/default.nix deleted file mode 100644 index 4c15908eab191..0000000000000 --- a/pkgs/tools/system/auto-cpufreq/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ lib, python3Packages, fetchFromGitHub, substituteAll }: - -python3Packages.buildPythonPackage rec { - pname = "auto-cpufreq"; - version = "1.9.9"; - - src = fetchFromGitHub { - owner = "AdnanHodzic"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-D/5pwE2V+yXj92ECOUcl/dajMDbvVdz9YNJrl2Pzvts="; - }; - - propagatedBuildInputs = with python3Packages; [ setuptools-git-versioning click distro psutil ]; - - doCheck = false; - pythonImportsCheck = [ "auto_cpufreq" ]; - - patches = [ - # hardcodes version output - (substituteAll { - src = ./fix-version-output.patch; - inherit version; - }) - - # patch to prevent script copying and to disable install - ./prevent-install-and-copy.patch - # patch to prevent update - ./prevent-update.patch - ]; - - postInstall = '' - # copy script manually - cp ${src}/scripts/cpufreqctl.sh $out/bin/cpufreqctl.auto-cpufreq - - # systemd service - mkdir -p $out/lib/systemd/system - cp ${src}/scripts/auto-cpufreq.service $out/lib/systemd/system - ''; - - meta = with lib; { - mainProgram = "${pname}"; - homepage = "https://github.com/AdnanHodzic/auto-cpufreq"; - description = "Automatic CPU speed & power optimizer for Linux"; - license = licenses.lgpl3Plus; - platforms = platforms.linux; - maintainers = [ maintainers.Technical27 ]; - }; -} diff --git a/pkgs/tools/system/auto-cpufreq/fix-version-output.patch b/pkgs/tools/system/auto-cpufreq/fix-version-output.patch deleted file mode 100644 index fad9f091da40e..0000000000000 --- a/pkgs/tools/system/auto-cpufreq/fix-version-output.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff --git a/auto_cpufreq/core.py b/auto_cpufreq/core.py -index 99397a9..f3ef28f 100755 ---- a/auto_cpufreq/core.py -+++ b/auto_cpufreq/core.py -@@ -144,26 +144,10 @@ except PermissionError: - - # display running version of auto-cpufreq - def app_version(): -+ print("auto-cpufreq version: @version@") -+ print("Git commit: v@version@") - -- print("auto-cpufreq version: ", end="") - -- # snap package -- if os.getenv("PKG_MARKER") == "SNAP": -- print(getoutput("echo \(Snap\) $SNAP_VERSION")) -- # aur package -- elif dist_name in ["arch", "manjaro", "garuda"]: -- aur_pkg_check = call("pacman -Qs auto-cpufreq > /dev/null", shell=True) -- if aur_pkg_check == 1: -- print(get_formatted_version()) -- else: -- print(getoutput("pacman -Qi auto-cpufreq | grep Version")) -- else: -- # source code (auto-cpufreq-installer) -- try: -- print(get_formatted_version()) -- except Exception as e: -- print(repr(e)) -- pass - def verify_update(): - # Specify the repository and package name - # IT IS IMPORTANT TO THAT IF THE REPOSITORY STRUCTURE IS CHANGED, THE FOLLOWING FUNCTION NEEDS TO BE UPDATED ACCORDINGLY \ No newline at end of file diff --git a/pkgs/tools/system/auto-cpufreq/prevent-install-and-copy.patch b/pkgs/tools/system/auto-cpufreq/prevent-install-and-copy.patch deleted file mode 100644 index 9b5bffb5591ee..0000000000000 --- a/pkgs/tools/system/auto-cpufreq/prevent-install-and-copy.patch +++ /dev/null @@ -1,163 +0,0 @@ -diff --git a/auto_cpufreq/core.py b/auto_cpufreq/core.py -index 99397a9..48a377a 100755 ---- a/auto_cpufreq/core.py -+++ b/auto_cpufreq/core.py -@@ -350,30 +334,13 @@ def get_current_gov(): - - - def cpufreqctl(): -- """ -- deploy cpufreqctl script -- """ -- -- # detect if running on a SNAP -- if os.getenv("PKG_MARKER") == "SNAP": -- pass -- else: -- # deploy cpufreqctl.auto-cpufreq script -- if not os.path.isfile("/usr/local/bin/cpufreqctl.auto-cpufreq"): -- shutil.copy(SCRIPTS_DIR / "cpufreqctl.sh", "/usr/local/bin/cpufreqctl.auto-cpufreq") -+ # scripts are already in the correct place -+ pass - - - def cpufreqctl_restore(): -- """ -- remove cpufreqctl.auto-cpufreq script -- """ -- # detect if running on a SNAP -- if os.getenv("PKG_MARKER") == "SNAP": -- pass -- else: -- if os.path.isfile("/usr/local/bin/cpufreqctl.auto-cpufreq"): -- os.remove("/usr/local/bin/cpufreqctl.auto-cpufreq") -- -+ # no need to restore -+ pass - - def footer(l=79): - print("\n" + "-" * l + "\n") -@@ -400,30 +367,8 @@ def remove_complete_msg(): - - - def deploy_daemon(): -- print("\n" + "-" * 21 + " Deploying auto-cpufreq as a daemon " + "-" * 22 + "\n") -- -- # deploy cpufreqctl script func call -- cpufreqctl() -- -- # turn off bluetooth on boot -- bluetooth_disable() -- -- auto_cpufreq_stats_path.touch(exist_ok=True) -- -- print("\n* Deploy auto-cpufreq install script") -- shutil.copy(SCRIPTS_DIR / "auto-cpufreq-install.sh", "/usr/local/bin/auto-cpufreq-install") -- -- print("\n* Deploy auto-cpufreq remove script") -- shutil.copy(SCRIPTS_DIR / "auto-cpufreq-remove.sh", "/usr/local/bin/auto-cpufreq-remove") -- -- # output warning if gnome power profile is running -- gnome_power_detect_install() -- gnome_power_svc_disable() -- -- # output warning if TLP service is detected -- tlp_service_detect() -- -- call("/usr/local/bin/auto-cpufreq-install", shell=True) -+ # prevent needless copying and system changes -+ pass - - - def deploy_daemon_performance(): -@@ -463,40 +408,7 @@ def deploy_daemon_performance(): - - # remove auto-cpufreq daemon - def remove_daemon(): -- -- # check if auto-cpufreq is installed -- if not os.path.exists("/usr/local/bin/auto-cpufreq-remove"): -- print("\nauto-cpufreq daemon is not installed.\n") -- sys.exit(1) -- -- print("\n" + "-" * 21 + " Removing auto-cpufreq daemon " + "-" * 22 + "\n") -- -- # turn on bluetooth on boot -- bluetooth_enable() -- -- # output warning if gnome power profile is stopped -- gnome_power_rm_reminder() -- gnome_power_svc_enable() -- -- # run auto-cpufreq daemon remove script -- call("/usr/local/bin/auto-cpufreq-remove", shell=True) -- -- # remove auto-cpufreq-remove -- os.remove("/usr/local/bin/auto-cpufreq-remove") -- -- # delete override pickle if it exists -- if os.path.exists(governor_override_state): -- os.remove(governor_override_state) -- -- # delete stats file -- if auto_cpufreq_stats_path.exists(): -- if auto_cpufreq_stats_file is not None: -- auto_cpufreq_stats_file.close() -- -- auto_cpufreq_stats_path.unlink() -- -- # restore original cpufrectl script -- cpufreqctl_restore() -+ pass - - - def gov_check(): - -diff --git a/bin/auto-cpufreq b/bin/auto-cpufreq -index b89d925..b73974c 100755 ---- a/bin/auto-cpufreq -+++ b/bin/auto-cpufreq -@@ -189,41 +189,9 @@ - print("https://github.com/AdnanHodzic/auto-cpufreq/#donate") - footer() - elif install: -- if os.getenv("PKG_MARKER") == "SNAP": -- root_check() -- running_daemon_check() -- gnome_power_detect_snap() -- tlp_service_detect_snap() -- bluetooth_notif_snap() -- gov_check() -- run("snapctl set daemon=enabled", shell=True) -- run("snapctl start --enable auto-cpufreq", shell=True) -- deploy_complete_msg() -- else: -- root_check() -- running_daemon_check() -- gov_check() -- deploy_daemon() -- deploy_complete_msg() -+ print("install is disabled in the nix package") - elif remove: -- if os.getenv("PKG_MARKER") == "SNAP": -- root_check() -- run("snapctl set daemon=disabled", shell=True) -- run("snapctl stop --disable auto-cpufreq", shell=True) -- if auto_cpufreq_stats_path.exists(): -- if auto_cpufreq_stats_file is not None: -- auto_cpufreq_stats_file.close() -- -- auto_cpufreq_stats_path.unlink() -- # ToDo: -- # {the following snippet also used in --update, update it there too(if required)} -- # * undo bluetooth boot disable -- gnome_power_rm_reminder_snap() -- remove_complete_msg() -- else: -- root_check() -- remove_daemon() -- remove_complete_msg() -+ print("remove is disabled in the nix package") - elif update: - root_check() - if os.getenv("PKG_MARKER") == "SNAP": \ No newline at end of file diff --git a/pkgs/tools/system/auto-cpufreq/prevent-update.patch b/pkgs/tools/system/auto-cpufreq/prevent-update.patch deleted file mode 100644 index 10da9fec97855..0000000000000 --- a/pkgs/tools/system/auto-cpufreq/prevent-update.patch +++ /dev/null @@ -1,60 +0,0 @@ -diff --git a/requirements.txt b/requirements.txt -index f492cac..e61d1a4 100755 ---- a/requirements.txt -+++ b/requirements.txt -@@ -2,4 +2,3 @@ - psutil - click - distro --requests - -diff --git a/auto_cpufreq/core.py b/auto_cpufreq/core.py -index 99397a9..697fb68 100755 ---- a/auto_cpufreq/core.py -+++ b/auto_cpufreq/core.py -@@ -18,7 +18,6 @@ from math import isclose - from pathlib import Path - from shutil import which - from subprocess import getoutput, call, run, check_output, DEVNULL --import requests - import re - - # execution timestamp used in countdown func - -diff --git a/bin/auto-cpufreq b/bin/auto-cpufreq -index b89d925..b73974c 100755 ---- a/bin/auto-cpufreq -+++ b/bin/auto-cpufreq -@@ -193,31 +193,7 @@ - elif remove: - print("remove is disabled in the nix package") - elif update: -- root_check() -- if os.getenv("PKG_MARKER") == "SNAP": -- print("Detected auto-cpufreq was installed using snap") -- # refresh snap directly using this command -- -- print("Please update using snap package manager, i.e: `sudo snap refresh auto-cpufreq`.") -- #check for AUR -- elif subprocess.run(["bash", "-c", "command -v yay >/dev/null 2>&1"]).returncode == 0 or subprocess.run(["bash", "-c", "command -v pacman >/dev/null 2>&1"]).returncode == 0: -- print("Arch-based distribution with AUR support detected. Please refresh auto-cpufreq using your AUR helper.") -- else: -- verify_update() -- ans = input ("Do you want to update auto-cpufreq to the latest release? [y/n]: ") -- valid_options = ['y', 'Y', 'yes', 'YES', 'Yes'] -- if ans.lower() in valid_options: -- remove_daemon() -- remove_complete_msg() -- new_update() -- else: -- print("incorrect input\n") -- print("Aborted") -- print("enabling daemon") -- run(["auto-cpufreq", "--install"]) -- print("auto-cpufreq is installed with the latest version") -- app_version() -- -+ print("update is disabled in the nix package") - - - if __name__ == "__main__": \ No newline at end of file diff --git a/pkgs/tools/system/automatic-timezoned/default.nix b/pkgs/tools/system/automatic-timezoned/default.nix index 5cdedcffd1f4e..291da3c786ead 100644 --- a/pkgs/tools/system/automatic-timezoned/default.nix +++ b/pkgs/tools/system/automatic-timezoned/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "automatic-timezoned"; - version = "2.0.14"; + version = "2.0.17"; src = fetchFromGitHub { owner = "maxbrunet"; repo = pname; rev = "v${version}"; - sha256 = "sha256-6jHuN3Ojswhh7dVODlcPWttBxin3kpPn74h88o6QuoM="; + sha256 = "sha256-La6d4se3mvoBIWjlw61ehIvoEwHqeny+4/MBGpeTYE8="; }; - cargoHash = "sha256-EvBinuz3/a4IXLEHin9szng+PvDkf0nu5HWGgrb6G6A="; + cargoHash = "sha256-Wp+e83/lGUlZwSJcHcfGXAeUfiy9fDVjZJsWKbUIQGA="; meta = with lib; { description = "Automatically update system timezone based on location"; diff --git a/pkgs/tools/system/bfs/default.nix b/pkgs/tools/system/bfs/default.nix index ea23d7307d729..3469060c74c56 100644 --- a/pkgs/tools/system/bfs/default.nix +++ b/pkgs/tools/system/bfs/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { buildFlags = [ "release" ]; # "release" enables compiler optimizations meta = with lib; { - description = "A breadth-first version of the UNIX find command"; + description = "Breadth-first version of the UNIX find command"; longDescription = '' 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. diff --git a/pkgs/tools/system/bottom/default.nix b/pkgs/tools/system/bottom/default.nix index dfc1ffcd112c9..160baf72636be 100644 --- a/pkgs/tools/system/bottom/default.nix +++ b/pkgs/tools/system/bottom/default.nix @@ -43,7 +43,7 @@ rustPlatform.buildRustPackage rec { }; meta = with lib; { - description = "A cross-platform graphical process/system monitor with a customizable interface"; + description = "Cross-platform graphical process/system monitor with a customizable interface"; homepage = "https://github.com/ClementTsang/bottom"; changelog = "https://github.com/ClementTsang/bottom/blob/${version}/CHANGELOG.md"; license = licenses.mit; diff --git a/pkgs/tools/system/btop/default.nix b/pkgs/tools/system/btop/default.nix index dfbc50ab86844..d38b018128fad 100644 --- a/pkgs/tools/system/btop/default.nix +++ b/pkgs/tools/system/btop/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - description = "A monitor of resources"; + description = "Monitor of resources"; homepage = "https://github.com/aristocratos/btop"; changelog = "https://github.com/aristocratos/btop/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; diff --git a/pkgs/tools/system/consul-template/default.nix b/pkgs/tools/system/consul-template/default.nix index d9571cfcaa8d7..c71837ebb968e 100644 --- a/pkgs/tools/system/consul-template/default.nix +++ b/pkgs/tools/system/consul-template/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "consul-template"; - version = "0.37.6"; + version = "0.39.0"; src = fetchFromGitHub { owner = "hashicorp"; repo = "consul-template"; rev = "v${version}"; - hash = "sha256-YkhU8BFSQpYUfgB5CxtaRJOghfH1uu1gpvArIeWHXEI="; + hash = "sha256-I6uv3UtYQ0tpwz/ml3ZL9mRchsqxa8UNPw+vMpvlqmM="; }; - vendorHash = "sha256-3Z8EiO48+OAg/TnoKUuokLBSXnUUrxe8ZgE1nrILFSg="; + vendorHash = "sha256-xXRIYTd3rRe54lYDWI2PiCV8lG1H6cJfYpL+hdWZClU="; # consul-template tests depend on vault and consul services running to # execute tests so we skip them here diff --git a/pkgs/tools/system/das_watchdog/default.nix b/pkgs/tools/system/das_watchdog/default.nix index ec7eb2b173d0e..141e16181cec6 100644 --- a/pkgs/tools/system/das_watchdog/default.nix +++ b/pkgs/tools/system/das_watchdog/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { meta = with lib; { homepage = "https://github.com/kmatheussen/das_watchdog"; - description = "A general watchdog for the linux operating system"; + description = "General watchdog for the linux operating system"; longDescription = '' It should run in the background at all times to ensure a realtime process won't hang the machine."; diff --git a/pkgs/tools/system/dcfldd/default.nix b/pkgs/tools/system/dcfldd/default.nix index 0814055d48395..57ea989021b87 100644 --- a/pkgs/tools/system/dcfldd/default.nix +++ b/pkgs/tools/system/dcfldd/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ ]; meta = with lib; { - description = "An enhanced version of GNU dd"; + description = "Enhanced version of GNU dd"; homepage = "https://dcfldd.sourceforge.net/"; diff --git a/pkgs/tools/system/dd_rescue/default.nix b/pkgs/tools/system/dd_rescue/default.nix index f7501d7680346..e58499d2b2d45 100644 --- a/pkgs/tools/system/dd_rescue/default.nix +++ b/pkgs/tools/system/dd_rescue/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "A tool to copy data from a damaged block device"; + description = "Tool to copy data from a damaged block device"; maintainers = with maintainers; [ raskin domenkozar ]; platforms = platforms.linux; homepage = "http://www.garloff.de/kurt/linux/ddrescue/"; diff --git a/pkgs/tools/system/ddh/default.nix b/pkgs/tools/system/ddh/default.nix index 33618da36376e..14afcec4c4634 100644 --- a/pkgs/tools/system/ddh/default.nix +++ b/pkgs/tools/system/ddh/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "6yPDkbag81TZ4k72rbmGT6HWKdGK4yfKxjGNFKEWXPI="; meta = with lib; { - description = "A fast duplicate file finder"; + description = "Fast duplicate file finder"; longDescription = '' DDH traverses input directories and their subdirectories. It also hashes files as needed and reports findings. diff --git a/pkgs/tools/system/ddrescueview/default.nix b/pkgs/tools/system/ddrescueview/default.nix index 3576c0eb65376..d3a2e46da14bf 100644 --- a/pkgs/tools/system/ddrescueview/default.nix +++ b/pkgs/tools/system/ddrescueview/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "A tool to graphically examine ddrescue mapfiles"; + description = "Tool to graphically examine ddrescue mapfiles"; homepage = "https://sourceforge.net/projects/ddrescueview/"; license = licenses.gpl3Plus; platforms = platforms.linux; diff --git a/pkgs/tools/system/ddrutility/default.nix b/pkgs/tools/system/ddrutility/default.nix index fc81c35fa4626..ee1c549fca9a9 100644 --- a/pkgs/tools/system/ddrutility/default.nix +++ b/pkgs/tools/system/ddrutility/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { makeFlags = [ "DESTDIR=$(out)" ]; meta = with lib; { - description = "A set of utilities for hard drive data rescue"; + description = "Set of utilities for hard drive data rescue"; homepage = "https://sourceforge.net/projects/ddrutility/"; license = licenses.gpl2Plus; platforms = platforms.linux; diff --git a/pkgs/tools/system/dool/default.nix b/pkgs/tools/system/dool/default.nix index fc0da53123cab..f781f36dffbdc 100644 --- a/pkgs/tools/system/dool/default.nix +++ b/pkgs/tools/system/dool/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "dool"; - version = "1.3.1"; + version = "1.3.2"; src = fetchFromGitHub { owner = "scottchiefbaker"; repo = "dool"; rev = "v${version}"; - hash = "sha256-g74XyNtNdYf2qTCFBWIVZ3LhngDln/yu3bRJzO890JU="; + hash = "sha256-G9mcvUPGQw+0AtvlHdnnfAmcZtcUH/Sc77UVeA/FYZc="; }; buildInputs = [ diff --git a/pkgs/tools/system/efibootmgr/default.nix b/pkgs/tools/system/efibootmgr/default.nix deleted file mode 100644 index 1eda5cbbce553..0000000000000 --- a/pkgs/tools/system/efibootmgr/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, efivar, popt }: - -stdenv.mkDerivation rec { - pname = "efibootmgr"; - version = "18"; - - src = fetchFromGitHub { - owner = "rhboot"; - repo = "efibootmgr"; - rev = version; - hash = "sha256-DYYQGALEn2+mRHgqCJsA7OQCF7xirIgQlWexZ9uoKcg="; - }; - - nativeBuildInputs = [ pkg-config ]; - - buildInputs = [ efivar popt ]; - - makeFlags = [ - "EFIDIR=nixos" - "PKG_CONFIG=${stdenv.cc.targetPrefix}pkg-config" - ]; - - installFlags = [ "prefix=$(out)" ]; - - meta = with lib; { - description = "A Linux user-space application to modify the Intel Extensible Firmware Interface (EFI) Boot Manager"; - homepage = "https://github.com/rhboot/efibootmgr"; - license = licenses.gpl2Only; - maintainers = with maintainers; [ ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/tools/system/epilys-bb/default.nix b/pkgs/tools/system/epilys-bb/default.nix index 44a1e566c5d47..e368c7c9ec483 100644 --- a/pkgs/tools/system/epilys-bb/default.nix +++ b/pkgs/tools/system/epilys-bb/default.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-+aCMwKOg+3HDntG14gjJLec8XD51wuTyYyzLjuW6lbY="; meta = with lib; { - description = "A clean, simple, and fast process viewer"; + description = "Clean, simple, and fast process viewer"; homepage = "https://nessuent.xyz/bb.html"; license = licenses.gpl3Plus; maintainers = with maintainers; [ cafkafk ]; diff --git a/pkgs/tools/system/fcron/default.nix b/pkgs/tools/system/fcron/default.nix index 95f46833cf206..c9ffa02744575 100644 --- a/pkgs/tools/system/fcron/default.nix +++ b/pkgs/tools/system/fcron/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description="A command scheduler with extended capabilities over cron and anacron"; + description="Command scheduler with extended capabilities over cron and anacron"; homepage = "http://fcron.free.fr"; license = licenses.gpl2Plus; platforms = lib.platforms.all; diff --git a/pkgs/tools/system/fdisk/default.nix b/pkgs/tools/system/fdisk/default.nix index b48108ea76c4c..f2b3ab0f81325 100644 --- a/pkgs/tools/system/fdisk/default.nix +++ b/pkgs/tools/system/fdisk/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = { - description = "A command-line disk partitioning tool"; + description = "Command-line disk partitioning tool"; longDescription = '' GNU fdisk provides a GNU version of the common disk partitioning tool fdisk. fdisk is used for the creation and manipulation of disk partition diff --git a/pkgs/tools/system/gdu/default.nix b/pkgs/tools/system/gdu/default.nix index 19389acd4e143..dfb1179a08972 100644 --- a/pkgs/tools/system/gdu/default.nix +++ b/pkgs/tools/system/gdu/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "gdu"; - version = "5.28.0"; + version = "5.29.0"; src = fetchFromGitHub { owner = "dundee"; repo = "gdu"; rev = "refs/tags/v${version}"; - hash = "sha256-HfWJVO62UeKE513fq1PaXyaldmrnQ/Fh5bXWSa0xGls="; + hash = "sha256-w48I7HU/pA53Pq6ZVwtby+YvFddVUjj8orL40Gifqoo="; }; - vendorHash = "sha256-SlVJDb24txy7DPsL0cG7LeGUjngXaUQ1SusgBfgf4PE="; + vendorHash = "sha256-aKhHC3sPRyi/l9BxeUgx+3TdYulb0cI9WxuPvbLoswg="; nativeBuildInputs = [ installShellFiles ]; @@ -40,6 +40,11 @@ buildGoModule rec { doCheck = !stdenv.isDarwin; + checkFlags = [ + # https://github.com/dundee/gdu/issues/371 + "-skip=TestStoredAnalyzer" + ]; + passthru.tests.version = testers.testVersion { package = gdu; }; meta = with lib; { diff --git a/pkgs/tools/system/go-audit/default.nix b/pkgs/tools/system/go-audit/default.nix index 38fd388973902..722fdad702c53 100644 --- a/pkgs/tools/system/go-audit/default.nix +++ b/pkgs/tools/system/go-audit/default.nix @@ -20,7 +20,7 @@ buildGoModule rec { doCheck = false; meta = with lib; { - description = "An alternative to the auditd daemon"; + description = "Alternative to the auditd daemon"; homepage = "https://github.com/slackhq/go-audit"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; diff --git a/pkgs/tools/system/gopsuinfo/default.nix b/pkgs/tools/system/gopsuinfo/default.nix index b4a1003e40cfe..1deeeee1722ca 100644 --- a/pkgs/tools/system/gopsuinfo/default.nix +++ b/pkgs/tools/system/gopsuinfo/default.nix @@ -32,7 +32,7 @@ buildGoModule rec { postInstall = '' make install DESTDIR=$out ''; meta = with lib; { - description = "A gopsutil-based command to display system usage info"; + description = "Gopsutil-based command to display system usage info"; homepage = "https://github.com/nwg-piotr/gopsuinfo"; license = licenses.bsd2; maintainers = with maintainers; [ otini ]; diff --git a/pkgs/tools/system/gotop/default.nix b/pkgs/tools/system/gotop/default.nix index 9681d3286cefd..5305b127a1c51 100644 --- a/pkgs/tools/system/gotop/default.nix +++ b/pkgs/tools/system/gotop/default.nix @@ -44,7 +44,7 @@ buildGoModule rec { ''; meta = with lib; { - description = "A terminal based graphical activity monitor inspired by gtop and vtop"; + description = "Terminal based graphical activity monitor inspired by gtop and vtop"; homepage = "https://github.com/xxxserxxx/gotop"; changelog = "https://github.com/xxxserxxx/gotop/raw/v${version}/CHANGELOG.md"; license = licenses.mit; diff --git a/pkgs/tools/system/gptman/default.nix b/pkgs/tools/system/gptman/default.nix index 533210ee4d8f8..cd9fd43615639 100644 --- a/pkgs/tools/system/gptman/default.nix +++ b/pkgs/tools/system/gptman/default.nix @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec { }; meta = with lib; { - description = "A GPT manager that allows you to copy partitions from one disk to another and more"; + description = "GPT manager that allows you to copy partitions from one disk to another and more"; homepage = "https://github.com/rust-disk-partition-management/gptman"; license = with licenses; [ asl20 /* or */ mit ]; maintainers = with maintainers; [ akshgpt7 ]; diff --git a/pkgs/tools/system/gt5/default.nix b/pkgs/tools/system/gt5/default.nix index 49d9fe651d497..c62ff2c3a8db0 100644 --- a/pkgs/tools/system/gt5/default.nix +++ b/pkgs/tools/system/gt5/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "A diff-capable 'du' browser"; + description = "Diff-capable 'du' browser"; homepage = "https://gt5.sourceforge.net/"; license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [viric]; diff --git a/pkgs/tools/system/honcho/default.nix b/pkgs/tools/system/honcho/default.nix index 08c0fb3f6b58f..1540d227dffe3 100644 --- a/pkgs/tools/system/honcho/default.nix +++ b/pkgs/tools/system/honcho/default.nix @@ -29,7 +29,7 @@ python3Packages.buildPythonApplication rec { ''; meta = with lib; { - description = "A Python clone of Foreman, a tool for managing Procfile-based applications"; + description = "Python clone of Foreman, a tool for managing Procfile-based applications"; license = licenses.mit; homepage = "https://github.com/nickstenning/honcho"; maintainers = with maintainers; [ benley ]; diff --git a/pkgs/tools/system/htop/default.nix b/pkgs/tools/system/htop/default.nix index 20274695f8ac2..55e9b5e9365cb 100644 --- a/pkgs/tools/system/htop/default.nix +++ b/pkgs/tools/system/htop/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "An interactive process viewer"; + description = "Interactive process viewer"; homepage = "https://htop.dev"; license = licenses.gpl2Only; platforms = platforms.all; diff --git a/pkgs/tools/system/htop/htop-vim.nix b/pkgs/tools/system/htop/htop-vim.nix index 7f020f54f9de9..6dfb72c8ca75e 100644 --- a/pkgs/tools/system/htop/htop-vim.nix +++ b/pkgs/tools/system/htop/htop-vim.nix @@ -13,7 +13,7 @@ htop.overrideAttrs (oldAttrs: rec { meta = with lib; { inherit (oldAttrs.meta) platforms license; - description = "An interactive process viewer for Linux, with vim-style keybindings"; + description = "Interactive process viewer for Linux, with vim-style keybindings"; homepage = "https://github.com/KoffeinFlummi/htop-vim"; maintainers = with maintainers; [ thiagokokada ]; mainProgram = "htop"; diff --git a/pkgs/tools/system/incron/default.nix b/pkgs/tools/system/incron/default.nix index b0a2765ddfe10..5c26235f8452b 100644 --- a/pkgs/tools/system/incron/default.nix +++ b/pkgs/tools/system/incron/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "A cron-like daemon which handles filesystem events"; + description = "Cron-like daemon which handles filesystem events"; homepage = "https://github.com/ar-/incron"; license = licenses.gpl2Only; maintainers = [ maintainers.aanderse ]; diff --git a/pkgs/tools/system/inxi/default.nix b/pkgs/tools/system/inxi/default.nix index fff9befd714bd..c00df8611ea1a 100644 --- a/pkgs/tools/system/inxi/default.nix +++ b/pkgs/tools/system/inxi/default.nix @@ -46,7 +46,7 @@ in stdenv.mkDerivation rec { ''; meta = with lib; { - description = "A full featured CLI system information tool"; + description = "Full featured CLI system information tool"; longDescription = '' inxi is a command line system information script built for console and IRC. It is also used a debugging tool for forum technical support to diff --git a/pkgs/tools/system/ipmiutil/default.nix b/pkgs/tools/system/ipmiutil/default.nix index b08d705cad17e..cbc239b8c13a8 100644 --- a/pkgs/tools/system/ipmiutil/default.nix +++ b/pkgs/tools/system/ipmiutil/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { env.NIX_CFLAGS_COMPILE = "-fno-stack-protector"; meta = with lib; { - description = "An easy-to-use IPMI server management utility"; + description = "Easy-to-use IPMI server management utility"; homepage = "https://ipmiutil.sourceforge.net/"; maintainers = with maintainers; [ raskin ]; platforms = platforms.linux; diff --git a/pkgs/tools/system/java-service-wrapper/default.nix b/pkgs/tools/system/java-service-wrapper/default.nix index 9578941ef9a12..2b33564b683ff 100644 --- a/pkgs/tools/system/java-service-wrapper/default.nix +++ b/pkgs/tools/system/java-service-wrapper/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "java-service-wrapper"; - version = "3.5.56"; + version = "3.5.57"; src = fetchurl { url = "https://wrapper.tanukisoftware.com/download/${version}/wrapper_${version}_src.tar.gz"; - hash = "sha256-zZfJP/uf78D/6G51Km1bNRRIv5i8x69Xw+imho4/ZpQ="; + hash = "sha256-86YusgyLUveMrXepAtnABgdZCGlQDQjVFnG9GqFnCIg="; }; strictDeps = true; diff --git a/pkgs/tools/system/jobber/default.nix b/pkgs/tools/system/jobber/default.nix index d9620e49977b8..e194e69c2cfc9 100644 --- a/pkgs/tools/system/jobber/default.nix +++ b/pkgs/tools/system/jobber/default.nix @@ -33,7 +33,7 @@ buildGoModule rec { meta = with lib; { homepage = "https://dshearer.github.io/jobber"; changelog = "https://github.com/dshearer/jobber/releases/tag/v${version}"; - description = "An alternative to cron, with sophisticated status-reporting and error-handling"; + description = "Alternative to cron, with sophisticated status-reporting and error-handling"; license = licenses.mit; maintainers = with maintainers; [ urandom ]; mainProgram = "jobber"; diff --git a/pkgs/tools/system/jsvc/default.nix b/pkgs/tools/system/jsvc/default.nix index f8f67b0f45f95..2d01daabd01b3 100644 --- a/pkgs/tools/system/jsvc/default.nix +++ b/pkgs/tools/system/jsvc/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "jsvc"; - version = "1.3.4"; + version = "1.4.0"; src = fetchurl { url = "https://downloads.apache.org//commons/daemon/source/commons-daemon-${version}-src.tar.gz"; - sha256 = "sha256-30hJ0F5YFmEOZ4IYg/T8HhFySgu4t4uEsh7dUDns674="; + sha256 = "sha256-AFnx6AqmOfAsfh/4ALV9xiA2pbP0sX1h5dPj/9JCj+4="; }; buildInputs = [ commonsDaemon ]; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://commons.apache.org/proper/commons-daemon"; - description = "A part of the Apache Commons Daemon software, a set of utilities and Java support classes for running Java applications as server processes"; + description = "Part of the Apache Commons Daemon software, a set of utilities and Java support classes for running Java applications as server processes"; maintainers = with lib.maintainers; [ rsynnest ]; license = lib.licenses.asl20; platforms = with lib.platforms; unix; diff --git a/pkgs/tools/system/kanata/default.nix b/pkgs/tools/system/kanata/default.nix index d5df916498987..4f25b78f8bb29 100644 --- a/pkgs/tools/system/kanata/default.nix +++ b/pkgs/tools/system/kanata/default.nix @@ -31,7 +31,7 @@ rustPlatform.buildRustPackage rec { ''; meta = with lib; { - description = "A tool to improve keyboard comfort and usability with advanced customization"; + description = "Tool to improve keyboard comfort and usability with advanced customization"; homepage = "https://github.com/jtroo/kanata"; license = licenses.lgpl3Only; maintainers = with maintainers; [ bmanuel linj ]; diff --git a/pkgs/tools/system/localtime/default.nix b/pkgs/tools/system/localtime/default.nix index bdb1fa2e74445..9a0fdac7577dd 100644 --- a/pkgs/tools/system/localtime/default.nix +++ b/pkgs/tools/system/localtime/default.nix @@ -34,7 +34,7 @@ buildGoModule { ''; meta = with lib; { - description = "A daemon for keeping the system timezone up-to-date based on the current location"; + description = "Daemon for keeping the system timezone up-to-date based on the current location"; homepage = "https://github.com/Stebalien/localtime"; maintainers = with maintainers; [ lovesegfault ]; platforms = platforms.linux; diff --git a/pkgs/tools/system/logrotate/default.nix b/pkgs/tools/system/logrotate/default.nix index e92f34188f4ff..017cb0b1cb6cf 100644 --- a/pkgs/tools/system/logrotate/default.nix +++ b/pkgs/tools/system/logrotate/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "logrotate"; - version = "3.21.0"; + version = "3.22.0"; src = fetchFromGitHub { owner = "logrotate"; repo = "logrotate"; rev = version; - sha256 = "sha256-w86y6bz/nvH/0mIbn2XrSs5KdOM/xadnlZMQZp4LdGQ="; + sha256 = "sha256-D7E2mpC7v2kbsb1EyhR6hLvGbnIvGB2MK1n1gptYyKI="; }; # Logrotate wants to access the 'mail' program; to be done. diff --git a/pkgs/tools/system/memtester/default.nix b/pkgs/tools/system/memtester/default.nix index cb4f6768f2365..cb4d4eddb6445 100644 --- a/pkgs/tools/system/memtester/default.nix +++ b/pkgs/tools/system/memtester/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { installFlags = [ "INSTALLPATH=$(out)" ]; meta = with lib; { - description = "A userspace utility for testing the memory subsystem for faults"; + description = "Userspace utility for testing the memory subsystem for faults"; homepage = "http://pyropus.ca/software/memtester/"; license = licenses.gpl2Only; maintainers = [ maintainers.dezgeg ]; diff --git a/pkgs/tools/system/minijail/default.nix b/pkgs/tools/system/minijail/default.nix index 87913252ab4bd..05129009deee2 100644 --- a/pkgs/tools/system/minijail/default.nix +++ b/pkgs/tools/system/minijail/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "minijail"; - version = "18"; + version = "2024.05.22"; src = fetchFromGitiles { - url = "https://android.googlesource.com/platform/external/minijail"; + url = "https://chromium.googlesource.com/chromiumos/platform/minijail"; rev = "linux-v${version}"; - sha256 = "sha256-OpwzISZ5iZNQvJAX7UJJ4gELEaVfcQgY9cqMM0YvBzc="; + sha256 = "sha256-1NNjNEC0pNb0WW0PG5smltT1/dGYNRfhNxJtW0hngI8="; }; buildInputs = [ libcap ]; @@ -37,9 +37,9 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with lib; { - homepage = "https://android.googlesource.com/platform/external/minijail/"; + homepage = "https://chromium.googlesource.com/chromiumos/platform/minijail/+/refs/heads/main/README.md"; description = "Sandboxing library and application using Linux namespaces and capabilities"; - changelog = "https://android.googlesource.com/platform/external/minijail/+/refs/tags/linux-v${version}"; + changelog = "https://chromium.googlesource.com/chromiumos/platform/minijail/+/refs/tags/linux-v${version}"; license = licenses.bsd3; maintainers = with maintainers; [ pcarrier qyliss ]; platforms = platforms.linux; diff --git a/pkgs/tools/system/minijail/tools.nix b/pkgs/tools/system/minijail/tools.nix index 266879a303338..c9c52e479e78e 100644 --- a/pkgs/tools/system/minijail/tools.nix +++ b/pkgs/tools/system/minijail/tools.nix @@ -33,7 +33,7 @@ buildPythonApplication { meta = with lib; { homepage = "https://android.googlesource.com/platform/external/minijail/+/refs/heads/master/tools/"; - description = "A set of tools for minijail"; + description = "Set of tools for minijail"; license = licenses.asl20; inherit (minijail.meta) maintainers platforms; }; diff --git a/pkgs/tools/system/monit/default.nix b/pkgs/tools/system/monit/default.nix index 319d3492b48ef..49db2fae93d9b 100644 --- a/pkgs/tools/system/monit/default.nix +++ b/pkgs/tools/system/monit/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "monit"; - version = "5.33.0"; + version = "5.34.0"; src = fetchurl { url = "https://mmonit.com/monit/dist/monit-${version}.tar.gz"; - sha256 = "sha256-Gs6InAGDRzqdcBYN9lM7tuEzjcE1T1koUHgD4eKoY7U="; + sha256 = "sha256-N/UUzYlzu84QTLhRf/P8UEBSoINwPu4NDoc9smuRmCA="; }; nativeBuildInputs = [ bison flex ] ++ diff --git a/pkgs/tools/system/netdata/default.nix b/pkgs/tools/system/netdata/default.nix index b2461760da701..9ddba232de19c 100644 --- a/pkgs/tools/system/netdata/default.nix +++ b/pkgs/tools/system/netdata/default.nix @@ -1,9 +1,9 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, pkg-config, makeWrapper +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, pkg-config, makeWrapper , CoreFoundation, IOKit, libossp_uuid , nixosTests -, netdata-go-plugins -, bash, curl, jemalloc, json_c, libuv, zlib, libyaml +, bash, curl, jemalloc, json_c, libuv, zlib, libyaml, libelf, libbpf , libcap, libuuid, lm_sensors, protobuf +, go, buildGoModule, ninja , withCups ? false, cups , withDBengine ? true, lz4 , withIpmi ? (!stdenv.isDarwin), freeipmi @@ -15,11 +15,12 @@ , withSsl ? true, openssl , withSystemdJournal ? (!stdenv.isDarwin), systemd , withDebug ? false +, withEbpf ? false +, withNetworkViewer ? (!stdenv.isDarwin) }: stdenv.mkDerivation rec { - # Don't forget to update go.d.plugin.nix as well - version = "1.44.3"; + version = "1.45.4"; pname = "netdata"; src = fetchFromGitHub { @@ -27,21 +28,22 @@ stdenv.mkDerivation rec { repo = "netdata"; rev = "v${version}"; hash = if withCloudUi - then "sha256-ahWaq6geEoc6NZ2oU/Dqnb0bjRXd+q1zaRGOSIYVYok=" - else "sha256-2Kvh2WuoJjJxsFKueMjCAbazqZdzoOTxakbPVsj9PBo="; + then "sha256-g/wxKtpNsDw/ZaUokdip39enQHMysJE6pYGsApuL4po=" + # we delete the v2 GUI after fetching + else "sha256-Mkrmvdr19sWzFOkdpt46mcsbA3CNpXy4w8um95xaWlo="; fetchSubmodules = true; # Remove v2 dashboard distributed under NCUL1. Make sure an empty # Makefile.am exists, as autoreconf will get confused otherwise. postFetch = lib.optionalString (!withCloudUi) '' - rm -rf $out/web/gui/v2/* - touch $out/web/gui/v2/Makefile.am + rm -rf $out/src/web/gui/v2/* + touch $out/src/web/gui/v2/Makefile.am ''; }; strictDeps = true; - nativeBuildInputs = [ autoreconfHook pkg-config makeWrapper protobuf ]; + nativeBuildInputs = [ cmake pkg-config makeWrapper go ninja ]; # bash is only used to rewrite shebangs buildInputs = [ bash curl jemalloc json_c libuv zlib libyaml ] ++ lib.optionals stdenv.isDarwin [ CoreFoundation IOKit libossp_uuid ] @@ -52,23 +54,23 @@ stdenv.mkDerivation rec { ++ lib.optionals withNetfilter [ libmnl libnetfilter_acct ] ++ lib.optionals withConnPubSub [ google-cloud-cpp grpc ] ++ lib.optionals withConnPrometheus [ snappy ] + ++ lib.optionals withEbpf [ libelf libbpf ] ++ lib.optionals (withCloud || withConnPrometheus) [ protobuf ] ++ lib.optionals withSystemdJournal [ systemd ] ++ lib.optionals withSsl [ openssl ]; patches = [ - # required to prevent plugins from relying on /etc - # and /var - ./no-files-in-etc-and-var.patch - - # Avoid build-only inputs in closure leaked by configure command: - # https://github.com/NixOS/nixpkgs/issues/175693#issuecomment-1143344162 - ./skip-CONFIGURE_COMMAND.patch - # Allow building without non-free v2 dashboard. (fetchpatch { - url = "https://github.com/peat-psuwit/netdata/commit/6ccbdd1500db2b205923968688d5f1777430a326.patch"; - hash = "sha256-jAyk5HlxdjFn5IP6jOKP8/SXOraMQSA6r1krThe+s7g="; + url = "https://github.com/netdata/netdata/pull/17240/commits/b108df72281633234b731b223d99ec99f1d36adf.patch"; + hash = "sha256-tgsnbNY0pxFU3bz1J1qPaAeVsozsk2bpHV2mNy8A9is="; + }) + # Allow for go.d plugins to access the right directory. + # Can be removed once > v1.45.4 is released + # https://github.com/netdata/netdata/pull/17661 + (fetchpatch { + url = "https://patch-diff.githubusercontent.com/raw/netdata/netdata/pull/17661.patch"; + sha256 = "sha256-j+mrwkibQio2KO8UnV7sxzCoHmkcsalHNzP+YvrRz74="; }) ]; @@ -83,8 +85,8 @@ stdenv.mkDerivation rec { env.NIX_CFLAGS_COMPILE = lib.optionalString withDebug "-O1 -ggdb -DNETDATA_INTERNAL_CHECKS=1"; postInstall = '' - ln -s ${netdata-go-plugins}/lib/netdata/conf.d/* $out/lib/netdata/conf.d - ln -s ${netdata-go-plugins}/bin/godplugin $out/libexec/netdata/plugins.d/go.d.plugin + # Relocate one folder above. + mv $out/usr/* $out/ '' + lib.optionalString (!stdenv.isDarwin) '' # rename this plugin so netdata will look for setuid wrapper mv $out/libexec/netdata/plugins.d/apps.plugin \ @@ -95,6 +97,10 @@ stdenv.mkDerivation rec { $out/libexec/netdata/plugins.d/perf.plugin.org mv $out/libexec/netdata/plugins.d/slabinfo.plugin \ $out/libexec/netdata/plugins.d/slabinfo.plugin.org + mv $out/libexec/netdata/plugins.d/debugfs.plugin \ + $out/libexec/netdata/plugins.d/debugfs.plugin.org + mv $out/libexec/netdata/plugins.d/logs-management.plugin \ + $out/libexec/netdata/plugins.d/logs-management.plugin.org ${lib.optionalString withSystemdJournal '' mv $out/libexec/netdata/plugins.d/systemd-journal.plugin \ $out/libexec/netdata/plugins.d/systemd-journal.plugin.org @@ -103,53 +109,108 @@ stdenv.mkDerivation rec { mv $out/libexec/netdata/plugins.d/freeipmi.plugin \ $out/libexec/netdata/plugins.d/freeipmi.plugin.org ''} + ${lib.optionalString withNetworkViewer '' + mv $out/libexec/netdata/plugins.d/network-viewer.plugin \ + $out/libexec/netdata/plugins.d/network-viewer.plugin.org + ''} + ${lib.optionalString (!withCloudUi) '' + rm -rf $out/share/netdata/web/index.html + cp $out/share/netdata/web/v1/index.html $out/share/netdata/web/index.html + ''} ''; preConfigure = lib.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}"' + substituteInPlace src/collectors/python.d.plugin/python_modules/third_party/lm_sensors.py \ + --replace-fail 'ctypes.util.find_library("sensors")' '"${lm_sensors.out}/lib/libsensors${stdenv.hostPlatform.extensions.sharedLibrary}"' + '' + '' + export GOCACHE=$TMPDIR/go-cache + export GOPATH=$TMPDIR/go + export GOPROXY=file://${passthru.netdata-go-modules} + export GOSUMDB=off + + # Prevent the path to be caught into the Nix store path. + substituteInPlace CMakeLists.txt \ + --replace-fail 'set(CACHE_DIR "''${CMAKE_INSTALL_PREFIX}/var/cache/netdata")' 'set(CACHE_DIR "/var/cache/netdata")' \ + --replace-fail 'set(CONFIG_DIR "''${CMAKE_INSTALL_PREFIX}/etc/netdata")' 'set(CONFIG_DIR "/etc/netdata")' \ + --replace-fail 'set(LIBCONFIG_DIR "''${CMAKE_INSTALL_PREFIX}/usr/lib/netdata/conf.d")' 'set(LIBCONFIG_DIR "${placeholder "out"}/share/netdata/conf.d")' \ + --replace-fail 'set(LOG_DIR "''${CMAKE_INSTALL_PREFIX}/var/log/netdata")' 'set(LOG_DIR "/var/log/netdata")' \ + --replace-fail 'set(PLUGINS_DIR "''${CMAKE_INSTALL_PREFIX}/usr/libexec/netdata/plugins.d")' 'set(PLUGINS_DIR "${placeholder "out"}/libexec/netdata/plugins.d")' \ + --replace-fail 'set(VARLIB_DIR "''${CMAKE_INSTALL_PREFIX}/var/lib/netdata")' 'set(VARLIB_DIR "/var/lib/netdata")' \ + --replace-fail 'set(pkglibexecdir_POST "''${CMAKE_INSTALL_PREFIX}/usr/libexec/netdata")' 'set(pkglibexecdir_POST "${placeholder "out"}/libexec/netdata")' \ + --replace-fail 'set(localstatedir_POST "''${CMAKE_INSTALL_PREFIX}/var")' 'set(localstatedir_POST "/var")' \ + --replace-fail 'set(sbindir_POST "''${CMAKE_INSTALL_PREFIX}/usr/sbin")' 'set(sbindir_POST "${placeholder "out"}/bin")' \ + --replace-fail 'set(configdir_POST "''${CMAKE_INSTALL_PREFIX}/etc/netdata")' 'set(configdir_POST "/etc/netdata")' \ + --replace-fail 'set(libconfigdir_POST "''${CMAKE_INSTALL_PREFIX}/usr/lib/netdata/conf.d")' 'set(libconfigdir_POST "${placeholder "out"}/share/netdata/conf.d")' \ + --replace-fail 'set(cachedir_POST "''${CMAKE_INSTALL_PREFIX}/var/cache/netdata")' 'set(libconfigdir_POST "/var/cache/netdata")' \ + --replace-fail 'set(registrydir_POST "''${CMAKE_INSTALL_PREFIX}/var/lib/netdata/registry")' 'set(registrydir_POST "/var/lib/netdata/registry")' \ + --replace-fail 'set(varlibdir_POST "''${CMAKE_INSTALL_PREFIX}/var/lib/netdata")' 'set(varlibdir_POST "/var/lib/netdata")' ''; - configureFlags = [ - "--localstatedir=/var" - "--sysconfdir=/etc" - "--disable-ebpf" - "--with-jemalloc=${jemalloc}" - ] ++ lib.optionals (withSystemdJournal) [ - "--enable-plugin-systemd-journal" - ] ++ lib.optionals (!withDBengine) [ - "--disable-dbengine" - ] ++ lib.optionals (!withCloud) [ - "--disable-cloud" - ] ++ lib.optionals (!withCloudUi) [ - "--disable-cloud-ui" + cmakeFlags = [ + "-DWEB_DIR=share/netdata/web" + (lib.cmakeBool "ENABLE_CLOUD" withCloud) + # ACLK is agent cloud link. + (lib.cmakeBool "ENABLE_ACLK" withCloud) + (lib.cmakeBool "ENABLE_DASHBOARD_V2" withCloudUi) + (lib.cmakeBool "ENABLE_DBENGINE" withDBengine) + (lib.cmakeBool "ENABLE_PLUGIN_FREEIPMI" withIpmi) + (lib.cmakeBool "ENABLE_PLUGIN_SYSTEMD_JOURNAL" withSystemdJournal) + (lib.cmakeBool "ENABLE_PLUGIN_NETWORK_VIEWER" withNetworkViewer) + (lib.cmakeBool "ENABLE_PLUGIN_EBPF" withEbpf) + (lib.cmakeBool "ENABLE_PLUGIN_XENSTAT" false) + (lib.cmakeBool "ENABLE_PLUGIN_CUPS" withCups) + (lib.cmakeBool "ENABLE_EXPORTER_PROMETHEUS_REMOTE_WRITE" withConnPrometheus) + (lib.cmakeBool "ENABLE_JEMALLOC" true) + # Suggested by upstream. + "-G Ninja" ]; postFixup = '' - # remove once https://github.com/netdata/netdata/pull/16300 merged - substituteInPlace $out/bin/netdata-claim.sh \ - --replace /bin/echo echo - wrapProgram $out/bin/netdata-claim.sh --prefix PATH : ${lib.makeBinPath [ openssl ]} wrapProgram $out/libexec/netdata/plugins.d/cgroup-network-helper.sh --prefix PATH : ${lib.makeBinPath [ bash ]} wrapProgram $out/bin/netdatacli --set NETDATA_PIPENAME /run/netdata/ipc + + # Time to cleanup the output directory. + unlink $out/sbin + cp $out/etc/netdata/edit-config $out/bin/netdata-edit-config + mv $out/lib/netdata/conf.d $out/share/netdata/conf.d + rm -rf $out/{var,usr,etc} ''; enableParallelBuild = true; - passthru = { - inherit withIpmi; + passthru = rec { + netdata-go-modules = (buildGoModule { + pname = "netdata-go-plugins"; + inherit version src; + + sourceRoot = "${src.name}/src/go/collectors/go.d.plugin"; + + vendorHash = "sha256-KO+xMk6fpZCYRyxxKrsGfOHJ2bwjBaSmkgz1jIUHaZs="; + doCheck = false; + proxyVendor = true; + + ldflags = [ "-s" "-w" "-X main.version=${version}" ]; + + passthru.tests = tests; + meta = meta // { + description = "Netdata orchestrator for data collection modules written in Go"; + mainProgram = "godplugin"; + license = lib.licenses.gpl3Only; + }; + }).goModules; + inherit withIpmi withNetworkViewer; tests.netdata = nixosTests.netdata; }; meta = with lib; { - broken = stdenv.isDarwin || stdenv.buildPlatform != stdenv.hostPlatform; + broken = stdenv.isDarwin || stdenv.buildPlatform != stdenv.hostPlatform || withEbpf; description = "Real-time performance monitoring tool"; homepage = "https://www.netdata.cloud/"; changelog = "https://github.com/netdata/netdata/releases/tag/v${version}"; license = [ licenses.gpl3Plus ] ++ lib.optionals (withCloudUi) [ licenses.ncul1 ]; platforms = platforms.unix; - maintainers = with maintainers; [ raitobezarius ]; + maintainers = [ ]; }; } diff --git a/pkgs/tools/system/netdata/go.d.plugin.nix b/pkgs/tools/system/netdata/go.d.plugin.nix deleted file mode 100644 index 910ad29c13fa3..0000000000000 --- a/pkgs/tools/system/netdata/go.d.plugin.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ lib, fetchFromGitHub, buildGoModule, nixosTests }: - -buildGoModule rec { - pname = "netdata-go-plugins"; - version = "0.58.1"; - - src = fetchFromGitHub { - owner = "netdata"; - repo = "go.d.plugin"; - rev = "v${version}"; - hash = "sha256-zzHm98jec7MXnzVsrLlYIk+ILA3Ei43853dM1LdFz5c="; - }; - - vendorHash = "sha256-eb+GRFhfWxDkfH4x2VF3ogyT5z4OcIoqHtEVJ1tGsdA="; - - doCheck = false; - - ldflags = [ "-s" "-w" "-X main.version=${version}" ]; - - postInstall = '' - mkdir -p $out/lib/netdata/conf.d - cp -r config/* $out/lib/netdata/conf.d - ''; - - passthru.tests = { inherit (nixosTests) netdata; }; - - meta = with lib; { - description = "Netdata orchestrator for data collection modules written in go"; - mainProgram = "godplugin"; - homepage = "https://github.com/netdata/go.d.plugin"; - changelog = "https://github.com/netdata/go.d.plugin/releases/tag/v${version}"; - license = licenses.gpl3Only; - maintainers = [ maintainers.raitobezarius ]; - }; -} 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 deleted file mode 100644 index 039376fe4e3a7..0000000000000 --- a/pkgs/tools/system/netdata/no-files-in-etc-and-var.patch +++ /dev/null @@ -1,128 +0,0 @@ -diff --git c/collectors/Makefile.am i/collectors/Makefile.am -index 1bbb2e0ef..96c400d33 100644 ---- c/collectors/Makefile.am -+++ i/collectors/Makefile.am -@@ -33,7 +33,7 @@ usercustompluginsconfigdir=$(configdir)/custom-plugins.d - usergoconfigdir=$(configdir)/go.d - - # Explicitly install directories to avoid permission issues due to umask --install-exec-local: -+no-install-exec-local: - $(INSTALL) -d $(DESTDIR)$(usercustompluginsconfigdir) - $(INSTALL) -d $(DESTDIR)$(usergoconfigdir) - -diff --git c/collectors/charts.d.plugin/Makefile.am i/collectors/charts.d.plugin/Makefile.am -index f82992fd4..4cac1ae4f 100644 ---- c/collectors/charts.d.plugin/Makefile.am -+++ i/collectors/charts.d.plugin/Makefile.am -@@ -34,7 +34,7 @@ dist_userchartsconfig_DATA = \ - $(NULL) - - # Explicitly install directories to avoid permission issues due to umask --install-exec-local: -+no-install-exec-local: - $(INSTALL) -d $(DESTDIR)$(userchartsconfigdir) - - chartsconfigdir=$(libconfigdir)/charts.d -diff --git c/collectors/ebpf.plugin/Makefile.am i/collectors/ebpf.plugin/Makefile.am -index 2d5f92a6b..8b11c7502 100644 ---- c/collectors/ebpf.plugin/Makefile.am -+++ i/collectors/ebpf.plugin/Makefile.am -@@ -9,7 +9,7 @@ SUFFIXES = .in - userebpfconfigdir=$(configdir)/ebpf.d - - # Explicitly install directories to avoid permission issues due to umask --install-exec-local: -+no-install-exec-local: - $(INSTALL) -d $(DESTDIR)$(userebpfconfigdir) - - dist_noinst_DATA = \ -diff --git c/collectors/python.d.plugin/Makefile.am i/collectors/python.d.plugin/Makefile.am -index ca49c1c02..1b9bcc446 100644 ---- c/collectors/python.d.plugin/Makefile.am -+++ i/collectors/python.d.plugin/Makefile.am -@@ -32,7 +32,7 @@ dist_userpythonconfig_DATA = \ - $(NULL) - - # Explicitly install directories to avoid permission issues due to umask --install-exec-local: -+no-install-exec-local: - $(INSTALL) -d $(DESTDIR)$(userpythonconfigdir) - - pythonconfigdir=$(libconfigdir)/python.d -diff --git c/collectors/statsd.plugin/Makefile.am i/collectors/statsd.plugin/Makefile.am -index c8144c137..f8aaa89b6 100644 ---- c/collectors/statsd.plugin/Makefile.am -+++ i/collectors/statsd.plugin/Makefile.am -@@ -19,5 +19,5 @@ dist_userstatsdconfig_DATA = \ - $(NULL) - - # Explicitly install directories to avoid permission issues due to umask --install-exec-local: -+no-install-exec-local: - $(INSTALL) -d $(DESTDIR)$(userstatsdconfigdir) -diff --git c/health/Makefile.am i/health/Makefile.am -index 7d7bca4cc..3086876dd 100644 ---- c/health/Makefile.am -+++ i/health/Makefile.am -@@ -19,7 +19,7 @@ dist_userhealthconfig_DATA = \ - $(NULL) - - # Explicitly install directories to avoid permission issues due to umask --install-exec-local: -+no-install-exec-local: - $(INSTALL) -d $(DESTDIR)$(userhealthconfigdir) - - healthconfigdir=$(libconfigdir)/health.d -diff --git c/logsmanagement/Makefile.am i/logsmanagement/Makefile.am -index 33f08d556..1f08cbae9 100644 ---- c/logsmanagement/Makefile.am -+++ i/logsmanagement/Makefile.am -@@ -6,7 +6,7 @@ MAINTAINERCLEANFILES = $(srcdir)/Makefile.in - userlogsmanagconfigdir=$(configdir)/logsmanagement.d - - # Explicitly install directories to avoid permission issues due to umask --install-exec-local: -+no-install-exec-local: - $(INSTALL) -d $(DESTDIR)$(userlogsmanagconfigdir) - - dist_libconfig_DATA = \ -diff --git c/system/Makefile.am i/system/Makefile.am -index 1e96f6f4f..98122ecdc 100644 ---- c/system/Makefile.am -+++ i/system/Makefile.am -@@ -22,12 +22,9 @@ include $(top_srcdir)/build/subst.inc - SUFFIXES = .in - - dist_config_SCRIPTS = \ -- edit-config \ - $(NULL) - - dist_config_DATA = \ -- .install-type \ -- netdata-updater.conf \ - $(NULL) - - libconfigvnodesdir=$(libconfigdir)/vnodes -@@ -47,7 +44,7 @@ libsysrunitdir=$(libsysdir)/runit - libsyssystemddir=$(libsysdir)/systemd - - # Explicitly install directories to avoid permission issues due to umask --install-exec-local: -+no-install-exec-local: - $(INSTALL) -d $(DESTDIR)$(configdir) - $(INSTALL) -d $(DESTDIR)$(libsysdir) - $(INSTALL) -d $(DESTDIR)$(libsyscrondir) -diff --git c/web/Makefile.am i/web/Makefile.am -index be2c545c3..55f373114 100644 ---- c/web/Makefile.am -+++ i/web/Makefile.am -@@ -13,7 +13,7 @@ SUBDIRS = \ - usersslconfigdir=$(configdir)/ssl - - # Explicitly install directories to avoid permission issues due to umask --install-exec-local: -+no-install-exec-local: - $(INSTALL) -d $(DESTDIR)$(usersslconfigdir) - - dist_noinst_DATA = \ diff --git a/pkgs/tools/system/netdata/skip-CONFIGURE_COMMAND.patch b/pkgs/tools/system/netdata/skip-CONFIGURE_COMMAND.patch deleted file mode 100644 index 472da270798f3..0000000000000 --- a/pkgs/tools/system/netdata/skip-CONFIGURE_COMMAND.patch +++ /dev/null @@ -1,16 +0,0 @@ -Shrink closure size by avoiding paths embedded from configure call. - -https://github.com/NixOS/nixpkgs/issues/175693 -diff --git a/daemon/buildinfo.c b/daemon/buildinfo.c -index 56cde84fc..011e7579d 100644 ---- a/daemon/buildinfo.c -+++ b/daemon/buildinfo.c -@@ -1040,7 +1040,7 @@ static void build_info_set_status(BUILD_INFO_SLOT slot, bool status) { - - __attribute__((constructor)) void initialize_build_info(void) { - build_info_set_value(BIB_PACKAGING_NETDATA_VERSION, program_version); -- build_info_set_value(BIB_PACKAGING_CONFIGURE_OPTIONS, CONFIGURE_COMMAND); -+ build_info_set_value(BIB_PACKAGING_CONFIGURE_OPTIONS, "REMOVED FOR CLOSURE SIZE REASONS"); - - #ifdef COMPILED_FOR_LINUX - build_info_set_status(BIB_FEATURE_BUILT_FOR, true); diff --git a/pkgs/tools/system/nsc/default.nix b/pkgs/tools/system/nsc/default.nix index 8e902f7c8ab5b..d7664f9e317bf 100644 --- a/pkgs/tools/system/nsc/default.nix +++ b/pkgs/tools/system/nsc/default.nix @@ -51,7 +51,7 @@ buildGoModule rec { doCheck = !stdenv.isDarwin; meta = { - description = "A tool for creating NATS account and user access configurations"; + description = "Tool for creating NATS account and user access configurations"; homepage = "https://github.com/nats-io/nsc"; license = with lib.licenses; [ asl20 ]; maintainers = with lib.maintainers; [ cbrewster ]; diff --git a/pkgs/tools/system/nvitop/default.nix b/pkgs/tools/system/nvitop/default.nix index af53911c8862b..1c7ed6083daf2 100644 --- a/pkgs/tools/system/nvitop/default.nix +++ b/pkgs/tools/system/nvitop/default.nix @@ -30,7 +30,7 @@ python3Packages.buildPythonApplication rec { ''; meta = with lib; { - description = "An interactive NVIDIA-GPU process viewer, the one-stop solution for GPU process management"; + description = "Interactive NVIDIA-GPU process viewer, the one-stop solution for GPU process management"; homepage = "https://github.com/XuehaiPan/nvitop"; changelog = "https://github.com/XuehaiPan/nvitop/releases/tag/v${version}"; license = licenses.gpl3; diff --git a/pkgs/tools/system/nvtop/build-nvtop.nix b/pkgs/tools/system/nvtop/build-nvtop.nix index a72ab1ce0dfd3..cfc13f14c4719 100644 --- a/pkgs/tools/system/nvtop/build-nvtop.nix +++ b/pkgs/tools/system/nvtop/build-nvtop.nix @@ -75,7 +75,7 @@ stdenv.mkDerivation (finalAttrs: { }; meta = with lib; { - description = "A (h)top like task monitor for AMD, Adreno, Intel and NVIDIA GPUs"; + description = "(h)top like task monitor for AMD, Adreno, Intel and NVIDIA GPUs"; longDescription = '' Nvtop stands for Neat Videocard TOP, a (h)top like task monitor for AMD, Adreno, Intel and NVIDIA GPUs. It can handle multiple GPUs and print information about them in a htop familiar way. diff --git a/pkgs/tools/system/opencl-info/default.nix b/pkgs/tools/system/opencl-info/default.nix deleted file mode 100644 index fc549d2d7961f..0000000000000 --- a/pkgs/tools/system/opencl-info/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, opencl-clhpp, ocl-icd }: - -stdenv.mkDerivation { - pname = "opencl-info"; - version = "unstable-2014-02-21"; - - src = fetchFromGitHub { - owner = "marchv"; - repo = "opencl-info"; - rev = "3e53d001a98978feb865650cf0e93b045400c0d7"; - sha256 = "114lxgnjg40ivjjszkv4n3f3yq2lbrvywryvbazf20kqmdz7315l"; - }; - - patches = [ - # The cl.hpp header was removed from opencl-clhpp. This patch - # updates opencl-info to use the new cp2.hpp header. - # - # Submitted upstream: https://github.com/marchv/opencl-info/pull/2 - ./opencl-info-clhpp2.diff - ]; - - buildInputs = [ opencl-clhpp ocl-icd ]; - - NIX_LDFLAGS = "-lOpenCL"; - - installPhase = '' - install -Dm755 opencl-info $out/bin/opencl-info - ''; - - meta = with lib; { - description = "A tool to dump OpenCL platform/device information"; - homepage = "https://github.com/marchv/opencl-info"; - license = licenses.mit; - platforms = platforms.linux; - maintainers = with maintainers; [ abbradar ]; - mainProgram = "opencl-info"; - }; -} diff --git a/pkgs/tools/system/opencl-info/opencl-info-clhpp2.diff b/pkgs/tools/system/opencl-info/opencl-info-clhpp2.diff deleted file mode 100644 index 013222beebf74..0000000000000 --- a/pkgs/tools/system/opencl-info/opencl-info-clhpp2.diff +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/opencl-info.cpp b/opencl-info.cpp -index a23015d..a6de0c1 100644 ---- a/opencl-info.cpp -+++ b/opencl-info.cpp -@@ -7,7 +7,7 @@ - #if defined(__APPLE__) || defined(__MACOSX) - # include <OpenCL/cl.hpp> - #else --# include <CL/cl.hpp> -+# include <CL/cl2.hpp> - #endif - - #include <iostream> -@@ -130,7 +130,7 @@ int main() { - PconstEnd; - P(device, CL_DEVICE_LOCAL_MEM_SIZE); - Pbool(device, CL_DEVICE_ERROR_CORRECTION_SUPPORT); -- Pbool(device, CL_DEVICE_HOST_UNIFIED_MEMORY); -+ // Pbool(device, CL_DEVICE_HOST_UNIFIED_MEMORY); /* Deprecated in 2.0 */ - P(device, CL_DEVICE_PROFILING_TIMER_RESOLUTION); - Pbool(device, CL_DEVICE_ENDIAN_LITTLE); - Pbool(device, CL_DEVICE_AVAILABLE); diff --git a/pkgs/tools/system/openipmi/default.nix b/pkgs/tools/system/openipmi/default.nix index e1616460413d2..2102f9e52b7b8 100644 --- a/pkgs/tools/system/openipmi/default.nix +++ b/pkgs/tools/system/openipmi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, popt, ncurses, python3, readline, lib }: +{ stdenv, fetchurl, popt, ncurses, python3, readline, lib, openssl }: stdenv.mkDerivation rec { pname = "OpenIPMI"; @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { sha256 = "sha256-sFkRT2KZ1z8E/252oIV6Crgao2Le6ZZE0layI4ckN60="; }; - buildInputs = [ ncurses popt python3 readline ]; + buildInputs = [ ncurses popt python3 readline openssl ]; outputs = [ "out" "lib" "dev" "man" ]; meta = with lib; { homepage = "https://openipmi.sourceforge.io/"; - description = "A user-level library that provides a higher-level abstraction of IPMI and generic services"; + description = "User-level library that provides a higher-level abstraction of IPMI and generic services"; license = with licenses; [ gpl2Only lgpl2Only ]; platforms = platforms.linux; maintainers = with maintainers; [ arezvov ] ++ teams.c3d2.members; diff --git a/pkgs/tools/system/openseachest/default.nix b/pkgs/tools/system/openseachest/default.nix index ab17c23bc61e9..f1015683660c6 100644 --- a/pkgs/tools/system/openseachest/default.nix +++ b/pkgs/tools/system/openseachest/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "A collection of command line diagnostic tools for storage devices"; + description = "Collection of command line diagnostic tools for storage devices"; homepage = "https://github.com/Seagate/openSeaChest"; license = licenses.mpl20; maintainers = with maintainers; [ justinas ]; diff --git a/pkgs/tools/system/pciutils/default.nix b/pkgs/tools/system/pciutils/default.nix index 1e3b17caf90bb..5290455390c3d 100644 --- a/pkgs/tools/system/pciutils/default.nix +++ b/pkgs/tools/system/pciutils/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://mj.ucw.cz/sw/pciutils/"; - description = "A collection of programs for inspecting and manipulating configuration of PCI devices"; + description = "Collection of programs for inspecting and manipulating configuration of PCI devices"; license = licenses.gpl2Plus; platforms = platforms.unix; maintainers = [ maintainers.vcunat ]; # not really, but someone should watch it diff --git a/pkgs/tools/system/pdisk/default.nix b/pkgs/tools/system/pdisk/default.nix index e6c3e75007ed3..de0e0b890e727 100644 --- a/pkgs/tools/system/pdisk/default.nix +++ b/pkgs/tools/system/pdisk/default.nix @@ -78,7 +78,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "A low-level Apple partition table editor for Linux, OSS Apple version"; + description = "Low-level Apple partition table editor for Linux, OSS Apple version"; homepage = "https://github.com/apple-oss-distributions/pdisk"; license = with licenses; [ hpnd # original license statements seems to match this (in files that are shared with mac-fdisk) diff --git a/pkgs/tools/system/rex/default.nix b/pkgs/tools/system/rex/default.nix index 980874322bb84..0af9628f41a9a 100644 --- a/pkgs/tools/system/rex/default.nix +++ b/pkgs/tools/system/rex/default.nix @@ -88,7 +88,7 @@ perlPackages.buildPerlPackage rec { meta = { homepage = "https://www.rexify.org"; - description = "The friendly automation framework"; + description = "Friendly automation framework"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ qbit ]; }; diff --git a/pkgs/tools/system/runitor/default.nix b/pkgs/tools/system/runitor/default.nix index 6d2eeff80c604..d78417e6ee05f 100644 --- a/pkgs/tools/system/runitor/default.nix +++ b/pkgs/tools/system/runitor/default.nix @@ -27,7 +27,7 @@ buildGoModule rec { meta = with lib; { homepage = "https://bdd.fi/x/runitor"; - description = "A command runner with healthchecks.io integration"; + description = "Command runner with healthchecks.io integration"; longDescription = '' Runitor runs the supplied command, captures its output, and based on its exit code reports successful or failed execution to https://healthchecks.io or your diff --git a/pkgs/tools/system/sleuthkit/default.nix b/pkgs/tools/system/sleuthkit/default.nix index 934a81724446d..53d148a53028c 100644 --- a/pkgs/tools/system/sleuthkit/default.nix +++ b/pkgs/tools/system/sleuthkit/default.nix @@ -98,7 +98,7 @@ stdenv.mkDerivation (finalAttrs: { ''; meta = with lib; { - description = "A forensic/data recovery tool"; + description = "Forensic/data recovery tool"; homepage = "https://www.sleuthkit.org/"; changelog = "https://github.com/sleuthkit/sleuthkit/blob/${finalAttrs.src.rev}/NEWS.txt"; maintainers = with maintainers; [ raskin gfrascadorio ]; diff --git a/pkgs/tools/system/stress-ng/default.nix b/pkgs/tools/system/stress-ng/default.nix index 6ff1a8931b6ea..a0ab272c2a794 100644 --- a/pkgs/tools/system/stress-ng/default.nix +++ b/pkgs/tools/system/stress-ng/default.nix @@ -1,5 +1,6 @@ { lib, stdenv, fetchFromGitHub , attr, judy, keyutils, libaio, libapparmor, libbsd, libcap, libgcrypt, lksctp-tools, zlib +, libglvnd, mesa }: stdenv.mkDerivation rec { @@ -20,7 +21,7 @@ stdenv.mkDerivation rec { # All platforms inputs then Linux-only ones buildInputs = [ judy libbsd libgcrypt zlib ] ++ lib.optionals stdenv.hostPlatform.isLinux [ - attr keyutils libaio libapparmor libcap lksctp-tools + attr keyutils libaio libapparmor libcap lksctp-tools libglvnd mesa ]; makeFlags = [ diff --git a/pkgs/tools/system/supervise/default.nix b/pkgs/tools/system/supervise/default.nix index 3d69faf7bd4ff..8b6d7d97499c1 100644 --- a/pkgs/tools/system/supervise/default.nix +++ b/pkgs/tools/system/supervise/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/catern/supervise"; - description = "A minimal unprivileged process supervisor making use of modern Linux features"; + description = "Minimal unprivileged process supervisor making use of modern Linux features"; platforms = platforms.linux; license = licenses.gpl3; maintainers = with lib.maintainers; [ catern ]; diff --git a/pkgs/tools/system/thinkfan/default.nix b/pkgs/tools/system/thinkfan/default.nix index 17887cc7bdf58..60f268caca2a5 100644 --- a/pkgs/tools/system/thinkfan/default.nix +++ b/pkgs/tools/system/thinkfan/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { buildInputs = [ yaml-cpp ] ++ lib.optional smartSupport libatasmart; meta = { - description = "A simple, lightweight fan control program"; + description = "Simple, lightweight fan control program"; longDescription = '' Thinkfan is a minimalist fan control program. Originally designed specifically for IBM/Lenovo Thinkpads, it now supports any kind of diff --git a/pkgs/tools/system/vboot_reference/default.nix b/pkgs/tools/system/vboot_reference/default.nix index 4718173e430d2..6e5be5db44f9d 100644 --- a/pkgs/tools/system/vboot_reference/default.nix +++ b/pkgs/tools/system/vboot_reference/default.nix @@ -56,6 +56,6 @@ stdenv.mkDerivation rec { description = "Chrome OS partitioning and kernel signing tools"; license = licenses.bsd3; platforms = platforms.linux; - maintainers = with maintainers; [ lheckemann samueldr ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/tools/system/wsysmon/default.nix b/pkgs/tools/system/wsysmon/default.nix index 8f03fdf90ccd8..0e6635b0292fb 100644 --- a/pkgs/tools/system/wsysmon/default.nix +++ b/pkgs/tools/system/wsysmon/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - description = "A windows task manager clone for Linux"; + description = "Windows task manager clone for Linux"; homepage = "https://github.com/SlyFabi/WSysMon"; license = [ licenses.mit ]; platforms = platforms.linux; diff --git a/pkgs/tools/system/zps/default.nix b/pkgs/tools/system/zps/default.nix index ab093d9e553bc..62a9efe7d7d93 100644 --- a/pkgs/tools/system/zps/default.nix +++ b/pkgs/tools/system/zps/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "A small utility for listing and reaping zombie processes on GNU/Linux"; + description = "Small utility for listing and reaping zombie processes on GNU/Linux"; homepage = "https://github.com/orhun/zps"; changelog = "https://github.com/orhun/zps/releases/tag/${version}"; license = licenses.gpl3Only; diff --git a/pkgs/tools/system/zx/default.nix b/pkgs/tools/system/zx/default.nix index 1dec344ed3aaf..57d7cb97ea324 100644 --- a/pkgs/tools/system/zx/default.nix +++ b/pkgs/tools/system/zx/default.nix @@ -1,26 +1,28 @@ -{ lib -, buildNpmPackage -, fetchFromGitHub +{ + lib, + buildNpmPackage, + fetchFromGitHub, }: buildNpmPackage rec { pname = "zx"; - version = "7.2.3"; + version = "8.1.3"; src = fetchFromGitHub { owner = "google"; repo = "zx"; rev = version; - hash = "sha256-YMfecNazmL8J+f80FdIRvr2upQ7VgXSkQQnm8z0Swhw="; + hash = "sha256-h3osu1FDBZsawXxtSVBDjcIiRdqgElPMBxdx2N4cfeQ="; }; - npmDepsHash = "sha256-ywNd2LGjM35ecW4dnj0oNwdSX2CRy8i9OGKPIdI0UEQ="; + npmDepsHash = "sha256-bijPRIiGNGfbtZiQ5aEVGI3DfYfFeA1YbNCTdljDhfw="; meta = { description = "Tool for writing scripts using JavaScript"; homepage = "https://github.com/google/zx"; + changelog = "https://github.com/google/zx/releases/tag/${version}"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ hlolli ]; + maintainers = with lib.maintainers; [ jlbribeiro ]; mainProgram = "zx"; }; } |