From d5350856f32a84cb289702f5815b4526c3599e85 Mon Sep 17 00:00:00 2001 From: Leona Maroni Date: Tue, 21 Jan 2025 19:41:20 +0100 Subject: [PATCH] dstat: drop dstat is unmaintained since 2020 and dool is there as a replacement. --- pkgs/by-name/ds/dstat/fix_pluginpath.patch | 15 ------- pkgs/by-name/ds/dstat/package.nix | 48 ---------------------- pkgs/top-level/aliases.nix | 1 + 3 files changed, 1 insertion(+), 63 deletions(-) delete mode 100644 pkgs/by-name/ds/dstat/fix_pluginpath.patch delete mode 100644 pkgs/by-name/ds/dstat/package.nix diff --git a/pkgs/by-name/ds/dstat/fix_pluginpath.patch b/pkgs/by-name/ds/dstat/fix_pluginpath.patch deleted file mode 100644 index 06d7793da47e..000000000000 --- a/pkgs/by-name/ds/dstat/fix_pluginpath.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/dstat b/dstat -index 3ac7087..c5f089d 100755 ---- a/dstat -+++ b/dstat -@@ -66,9 +66,7 @@ if sys.version_info < (2, 3): - - pluginpath = [ - os.path.expanduser('~/.dstat/'), # home + /.dstat/ -- os.path.abspath(os.path.dirname(sys.argv[0])) + '/plugins/', # binary path + /plugins/ -- '/usr/share/dstat/', -- '/usr/local/share/dstat/', -+ os.path.abspath(os.path.dirname(sys.argv[0])) + '/../share/dstat/', # binary path + /../share/dstat/ - ] - - class Options: diff --git a/pkgs/by-name/ds/dstat/package.nix b/pkgs/by-name/ds/dstat/package.nix deleted file mode 100644 index 124590934026..000000000000 --- a/pkgs/by-name/ds/dstat/package.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ - lib, - fetchFromGitHub, - fetchpatch, - python3Packages, -}: - -python3Packages.buildPythonApplication rec { - pname = "dstat"; - format = "other"; - version = "0.7.4"; - - src = fetchFromGitHub { - owner = "dstat-real"; - repo = "dstat"; - rev = "v${version}"; - sha256 = "1qnmkhqmjd1m3if05jj29dvr5hn6kayq9bkkkh881w472c0zhp8v"; - }; - - propagatedBuildInputs = with python3Packages; [ six ]; - - patches = [ - ./fix_pluginpath.patch - # this fixes another bug with python3 - (fetchpatch { - url = "https://github.com/efexgee/dstat/commit/220a785321b13b6df92a536080aca6ef1cb644ad.patch"; - sha256 = "08kcz3yxvl35m55y7g1pr73x3bjcqnv0qlswxqyq8cqxg9zd64cn"; - }) - ]; - - makeFlags = [ "prefix=$(out)" ]; - - # remove deprecation warnings - preFixup = '' - sed -i "s/import collections/import collections.abc/g" $out/share/dstat/dstat.py $out/bin/dstat - sed -i "s/collections.Sequence/collections.abc.Sequence/g" "$out"/bin/dstat - ''; - - meta = with lib; { - homepage = "http://dag.wieers.com/home-made/dstat/"; - description = "Versatile resource statistics tool"; - mainProgram = "dstat"; - license = licenses.gpl2Plus; - platforms = platforms.linux; - maintainers = [ ]; - changelog = "https://github.com/dstat-real/dstat/blob/v${version}/ChangeLog"; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index f331974c7000..4ac92be89aeb 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -315,6 +315,7 @@ mapAliases { dotnet-sdk_2 = throw "'dotnet-sdk_2' has been renamed to/replaced by 'dotnetCorePackages.sdk_2_1'"; # Converted to throw 2024-10-17 dotnet-sdk_3 = throw "'dotnet-sdk_3' has been renamed to/replaced by 'dotnetCorePackages.sdk_3_1'"; # Converted to throw 2024-10-17 dotnet-sdk_5 = throw "'dotnet-sdk_5' has been renamed to/replaced by 'dotnetCorePackages.sdk_5_0'"; # Converted to throw 2024-10-17 + dstat = throw "'dstat' has been removed because it has been unmaintained since 2020. Use 'dool' instead."; # Added 2025-01-21 drush = throw "drush as a standalone package has been removed because it's no longer supported as a standalone tool"; dtv-scan-tables_linuxtv = dtv-scan-tables; # Added 2023-03-03 dtv-scan-tables_tvheadend = dtv-scan-tables; # Added 2023-03-03