diff options
Diffstat (limited to 'nixpkgs/pkgs/tools/system')
-rw-r--r-- | nixpkgs/pkgs/tools/system/automatic-timezoned/default.nix | 6 | ||||
-rw-r--r-- | nixpkgs/pkgs/tools/system/consul-template/default.nix | 6 | ||||
-rw-r--r-- | nixpkgs/pkgs/tools/system/gkraken/default.nix | 1 | ||||
-rw-r--r-- | nixpkgs/pkgs/tools/system/gptman/default.nix | 20 | ||||
-rw-r--r-- | nixpkgs/pkgs/tools/system/lshw/default.nix | 11 | ||||
-rw-r--r-- | nixpkgs/pkgs/tools/system/netdata/default.nix | 5 | ||||
-rw-r--r-- | nixpkgs/pkgs/tools/system/netdata/go.d.plugin.nix | 8 | ||||
-rw-r--r-- | nixpkgs/pkgs/tools/system/netdata/ipc-socket-in-run.patch | 13 | ||||
-rw-r--r-- | nixpkgs/pkgs/tools/system/nvidia-system-monitor-qt/default.nix | 66 | ||||
-rw-r--r-- | nixpkgs/pkgs/tools/system/proot/default.nix | 1 | ||||
-rw-r--r-- | nixpkgs/pkgs/tools/system/rex/default.nix | 6 |
11 files changed, 103 insertions, 40 deletions
diff --git a/nixpkgs/pkgs/tools/system/automatic-timezoned/default.nix b/nixpkgs/pkgs/tools/system/automatic-timezoned/default.nix index 6b48b6f642dc..e9ef13e649a8 100644 --- a/nixpkgs/pkgs/tools/system/automatic-timezoned/default.nix +++ b/nixpkgs/pkgs/tools/system/automatic-timezoned/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "automatic-timezoned"; - version = "1.0.116"; + version = "1.0.118"; src = fetchFromGitHub { owner = "maxbrunet"; repo = pname; rev = "v${version}"; - sha256 = "sha256-BS44/bN76iD659j1ISMBBw0o2uwLasd7CDJMh8LDII4="; + sha256 = "sha256-kV66aN/eGrGIX61zcdyow1f/VzrYW0m/TVOx13Jq88E="; }; - cargoHash = "sha256-tscxMeSS0BGJT7HlMrDsd3zMZXE0nUtd5qSzsSE2o/s="; + cargoHash = "sha256-705pVGdVixq/Xog8RBktERP8GBLkt8Ch2DozuSngTas="; meta = with lib; { description = "Automatically update system timezone based on location"; diff --git a/nixpkgs/pkgs/tools/system/consul-template/default.nix b/nixpkgs/pkgs/tools/system/consul-template/default.nix index 5ddc121f9d65..f32f933dbbaa 100644 --- a/nixpkgs/pkgs/tools/system/consul-template/default.nix +++ b/nixpkgs/pkgs/tools/system/consul-template/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "consul-template"; - version = "0.32.0"; + version = "0.33.0"; src = fetchFromGitHub { owner = "hashicorp"; repo = "consul-template"; rev = "v${version}"; - hash = "sha256-jpUDNtcJBcxlHt4GEVZLGT11QBgLHgOR3Y2TT7GROls="; + hash = "sha256-78RYFFpsW6onWd1aAxDf28GUblIGVtg0uZeURZPla8E="; }; - vendorHash = "sha256-DV+sZkTKsTygO/LOi6z0vSUgavyqYKB4F2fMxuFFdvw="; + vendorHash = "sha256-LRH3wMRSHIpavXSupFA9HLojBqWVObQfL+SM8ah4oBg="; # consul-template tests depend on vault and consul services running to # execute tests so we skip them here diff --git a/nixpkgs/pkgs/tools/system/gkraken/default.nix b/nixpkgs/pkgs/tools/system/gkraken/default.nix index b5bb7fd03c1b..f37a21db79f4 100644 --- a/nixpkgs/pkgs/tools/system/gkraken/default.nix +++ b/nixpkgs/pkgs/tools/system/gkraken/default.nix @@ -42,7 +42,6 @@ python3Packages.buildPythonApplication rec { ]; buildInputs = [ - gobject-introspection glib gtk3 libnotify diff --git a/nixpkgs/pkgs/tools/system/gptman/default.nix b/nixpkgs/pkgs/tools/system/gptman/default.nix index db15f8b02522..8c4d65010535 100644 --- a/nixpkgs/pkgs/tools/system/gptman/default.nix +++ b/nixpkgs/pkgs/tools/system/gptman/default.nix @@ -1,23 +1,29 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, libiconv }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, libiconv, testers, gptman }: rustPlatform.buildRustPackage rec { pname = "gptman"; - version = "0.8.3"; + version = "1.0.1"; src = fetchFromGitHub { - owner = "cecton"; + owner = "rust-disk-partition-management"; repo = pname; rev = "v${version}"; - sha256 = "sha256-hI3F1E1vdbNDEeJ4FrU0EvR0t64svzUIpI6zaf0CquM="; + hash = "sha256-sDRnvF/XPXgWIIIrOmnEuktP8XvZxPahF2n4h8RCX+o="; }; - cargoSha256 = "sha256-3PRGPZGymccRo9dtQZgMMEL29x+GiUkTzgc8uAB/ocQ="; + cargoHash = "sha256-voslPSh7n31cGTKaayKXomgiXWVTutuc4FxfnZUDejc="; buildInputs = lib.optional stdenv.isDarwin libiconv; + buildFeatures = [ "cli" ]; + + passthru.tests.version = testers.testVersion { + package = gptman; + }; + meta = with lib; { - description = "A CLI tool for Linux to copy a partition from one disk to another and more."; - homepage = "https://github.com/cecton/gptman"; + description = "A 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/nixpkgs/pkgs/tools/system/lshw/default.nix b/nixpkgs/pkgs/tools/system/lshw/default.nix index 76897823029a..f5b4486365c3 100644 --- a/nixpkgs/pkgs/tools/system/lshw/default.nix +++ b/nixpkgs/pkgs/tools/system/lshw/default.nix @@ -4,25 +4,28 @@ , hwdata , gtk2 , pkg-config +, gettext , sqlite # compile GUI , withGUI ? false }: stdenv.mkDerivation rec { pname = "lshw"; + # FIXME: when switching to a stable release: # Fix repology.org by not including the prefixed B, otherwise the `pname` attr # gets filled as `lshw-B.XX.XX` in `nix-env --query --available --attr nixpkgs.lshw --meta` # See https://github.com/NixOS/nix/pull/4463 for a definitive fix - version = "02.19"; + version = "unstable-2023-03-20"; src = fetchFromGitHub { owner = "lyonel"; repo = pname; - rev = "B.${version}"; - sha256 = "sha256-PzbNGc1pPiPLWWgTeWoNfAo+SsXgi1HcjnXfYXA9S0I="; + rev = "b4e067307906ec6f277cce5c8a882f5edd03cbbc"; + #rev = "B.${version}"; + sha256 = "sha256-ahdaQeYZEFCVxwAMJPMB9bfo3ndIiqFyM6OghXwtm1A="; }; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config gettext ]; buildInputs = [ hwdata ] ++ lib.optionals withGUI [ gtk2 sqlite ]; diff --git a/nixpkgs/pkgs/tools/system/netdata/default.nix b/nixpkgs/pkgs/tools/system/netdata/default.nix index 6c89a3d2e559..420cb2880af6 100644 --- a/nixpkgs/pkgs/tools/system/netdata/default.nix +++ b/nixpkgs/pkgs/tools/system/netdata/default.nix @@ -17,14 +17,14 @@ stdenv.mkDerivation rec { # Don't forget to update go.d.plugin.nix as well - version = "1.41.0"; + version = "1.42.0"; pname = "netdata"; src = fetchFromGitHub { owner = "netdata"; repo = "netdata"; rev = "v${version}"; - sha256 = "sha256-MZQ1ZTghH4bN7kCMqbyQlAGSgE70sYJxjiamTTH/6ds="; + hash = "sha256-Gd+lZVi0bU/7dXCZaPyRwWKkFOm+QNbuwgxcXS2YO7E="; fetchSubmodules = true; }; @@ -103,6 +103,7 @@ stdenv.mkDerivation rec { postFixup = '' 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 ''; enableParallelBuild = true; diff --git a/nixpkgs/pkgs/tools/system/netdata/go.d.plugin.nix b/nixpkgs/pkgs/tools/system/netdata/go.d.plugin.nix index b852fa868673..aebc633a5307 100644 --- a/nixpkgs/pkgs/tools/system/netdata/go.d.plugin.nix +++ b/nixpkgs/pkgs/tools/system/netdata/go.d.plugin.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "netdata-go-plugins"; - version = "0.54.0"; + version = "0.54.1"; src = fetchFromGitHub { owner = "netdata"; repo = "go.d.plugin"; rev = "v${version}"; - hash = "sha256-lfehYMBAIKy9sK/dzmVewbOazgc7Yt9qAJsUdQyTTHA="; + hash = "sha256-3cBgXkvXhSTwQ6qbUbH1nOba5QkjSKtzi2rb+OY06jE="; }; - vendorHash = "sha256-lVYnL88adyrb0i5o9GXPsddD9i/lKYg/kw0+tNlgjt0="; + vendorHash = "sha256-DLRcS8wqnwGRLEeMqWj5SfUvE3fz1hty9jItNfmCdRw="; doCheck = false; @@ -29,6 +29,6 @@ buildGoModule rec { 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 = [ maintainers.raitobezarius ]; }; } diff --git a/nixpkgs/pkgs/tools/system/netdata/ipc-socket-in-run.patch b/nixpkgs/pkgs/tools/system/netdata/ipc-socket-in-run.patch deleted file mode 100644 index a117955af095..000000000000 --- a/nixpkgs/pkgs/tools/system/netdata/ipc-socket-in-run.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/daemon/commands.h b/daemon/commands.h -index bd4aabfe1cbe4..ce7eb3c730228 100644 ---- a/daemon/commands.h -+++ b/daemon/commands.h -@@ -6,7 +6,7 @@ - #ifdef _WIN32 - # define PIPENAME "\\\\?\\pipe\\netdata-cli" - #else --# define PIPENAME "/tmp/netdata-ipc" -+# define PIPENAME "/run/netdata/ipc" - #endif - - #define MAX_COMMAND_LENGTH 4096 diff --git a/nixpkgs/pkgs/tools/system/nvidia-system-monitor-qt/default.nix b/nixpkgs/pkgs/tools/system/nvidia-system-monitor-qt/default.nix new file mode 100644 index 000000000000..e4e1868997be --- /dev/null +++ b/nixpkgs/pkgs/tools/system/nvidia-system-monitor-qt/default.nix @@ -0,0 +1,66 @@ +{ stdenv +, lib +, fetchFromGitHub +, cmake +, qtbase +, wrapQtAppsHook +, makeDesktopItem +, copyDesktopItems +}: + +let + # Based in desktop files from official packages: + # https://github.com/congard/nvidia-system-monitor-qt/tree/master/package + desktopItem = makeDesktopItem { + name = "nvidia-system-monitor-qt"; + desktopName = "NVIDIA System Monitor"; + icon = "qnvsm"; + exec = "qnvsm"; + categories = [ + "System" + "Utility" + "Qt" + ]; + }; +in +stdenv.mkDerivation rec { + pname = "nvidia-system-monitor-qt"; + version = "1.5"; + + src = fetchFromGitHub { + owner = "congard"; + repo = "nvidia-system-monitor-qt"; + rev = "v${version}"; + sha256 = "sha256-VDw5Wp/QFDV1zKF4yz0aR0Hox9KHXZmeAKzKLSlu8Ck="; + }; + + buildInputs = [ qtbase ]; + nativeBuildInputs = [ cmake wrapQtAppsHook copyDesktopItems ]; + + cmakeFlags = [ + "-DIconPath=${placeholder "out"}/share/icons/hicolor/512x512/apps/qnvsm.png" + "-DVersionPrefix=(Nixpkgs)" + ]; + + installPhase = '' + runHook preInstall + + install -Dm755 qnvsm $out/bin/qnvsm + install -Dm644 $src/icon.png $out/share/icons/hicolor/512x512/apps/qnvsm.png + + runHook postInstall + ''; + + desktopItems = [ desktopItem ]; + + meta = rec { + description = "Task Manager for Linux for NVIDIA graphics cards"; + homepage = "https://github.com/congard/nvidia-system-monitor-qt"; + downloadPage = "${homepage}/releases"; + changelog = "${downloadPage}/tag/v${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ hacker1024 ]; + mainProgram = "qnvsm"; + platforms = lib.platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/tools/system/proot/default.nix b/nixpkgs/pkgs/tools/system/proot/default.nix index 665be5cbabfe..a43b2ff7f202 100644 --- a/nixpkgs/pkgs/tools/system/proot/default.nix +++ b/nixpkgs/pkgs/tools/system/proot/default.nix @@ -48,5 +48,6 @@ stdenv.mkDerivation rec { platforms = platforms.linux; license = licenses.gpl2; maintainers = with maintainers; [ ianwookim makefu veprbl dtzWill ]; + mainProgram = "proot"; }; } diff --git a/nixpkgs/pkgs/tools/system/rex/default.nix b/nixpkgs/pkgs/tools/system/rex/default.nix index f27c2d1fd2af..0befdbd2a1e0 100644 --- a/nixpkgs/pkgs/tools/system/rex/default.nix +++ b/nixpkgs/pkgs/tools/system/rex/default.nix @@ -1,10 +1,10 @@ -{ pkgs, lib, fetchurl, fetchpatch, perl, perlPackages, rsync, which, installShellFiles, ... }: +{ pkgs, lib, fetchurl, fetchpatch, perlPackages, rsync, which, installShellFiles, ... }: perlPackages.buildPerlPackage rec { pname = "Rex"; - version = "1.14.0"; + version = "1.14.3"; src = fetchurl { url = "mirror://cpan/authors/id/F/FE/FERKI/Rex-${version}.tar.gz"; - hash = "sha256-RHxJbkaEjKF9lkl6JYFp2pvcKQurRGUU7FfM/m5lSz8="; + hash = "sha256-An0wQu+UC2dZDlmJ6W8irh5nunRIlcXdPbVpwFE3Alw="; }; buildInputs = with perlPackages; [ |