Unverified Commit d5350856 authored by Leona Maroni's avatar Leona Maroni
Browse files

dstat: drop 

dstat is unmaintained since 2020 and dool is there as a replacement.
parent 1cd1cb9d

pkgs/by-name/ds/dstat/fix_pluginpath.patch

deleted100644 → 0
+0 −15
Original line number Diff line number Diff line 
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:

pkgs/by-name/ds/dstat/package.nix

deleted100644 → 0
+0 −48
Original line number Diff line number Diff line 
{

  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";

  };

}

pkgs/top-level/aliases.nix

+1 −0
Original line number Diff line number Diff line
@@ -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