Unverified Commit 0f9dd70c authored by gbtb's avatar gbtb Committed by GitHub
Browse files

nvtopPackages.full: 3.1.0 -> 3.2.0 (#395432)

parent 27747792

pkgs/tools/system/nvtop/build-nvtop.nix

+19 −8
Original line number Diff line number Diff line
@@ -19,6 +19,8 @@ 
  panfrost ? false,

  panthor ? false,

  ascend ? false,

  v3d ? false,

  tpu ? false,

}:



let
@@ -34,17 +36,19 @@ let 
      }" \

      $out/bin/nvtop

  '';

  needDrm = (amd || msm || panfrost || panthor);

  needDrm = (amd || msm || panfrost || panthor || intel);

in

stdenv.mkDerivation (finalAttrs: {

  pname = "nvtop";

  version = "3.1.0";

  version = "3.2.0";



  # between generation of multiple update PRs for each package flavor and manual updates I choose manual updates

  # nixpkgs-update: no auto update

  src = fetchFromGitHub {

    owner = "Syllo";

    repo = "nvtop";

    rev = finalAttrs.version;

    hash = "sha256-MkkBY2PR6FZnmRMqv9MWqwPWRgixfkUQW5TWJtHEzwA=";

    hash = "sha256-8iChT55L2NSnHg8tLIry0rgi/4966MffShE0ib+2ywc=";

  };



  cmakeFlags = with lib.strings; [
@@ -58,11 +62,17 @@ stdenv.mkDerivation (finalAttrs: { 
    (cmakeBool "PANFROST_SUPPORT" panfrost)

    (cmakeBool "PANTHOR_SUPPORT" panthor)

    (cmakeBool "ASCEND_SUPPORT" ascend)

    (cmakeBool "V3D_SUPPORT" v3d)

    (cmakeBool "TPU_SUPPORT" tpu) # requires libtpuinfo which is not packaged yet

  ];

  nativeBuildInputs = [

  nativeBuildInputs =

    [

      cmake

    ]

    ++ lib.optionals finalAttrs.doCheck [

      gtest

  ] ++ lib.optional nvidia addDriverRunpath;

    ]

    ++ lib.optional nvidia addDriverRunpath;



  buildInputs =

    [ ncurses ]
@@ -79,7 +89,8 @@ stdenv.mkDerivation (finalAttrs: { 
    (lib.optionalString needDrm drm-postFixup)

    + (lib.optionalString nvidia "addDriverRunpath $out/bin/nvtop");



  doCheck = true;

  # https://github.com/Syllo/nvtop/commit/33ec008e26a00227a666ccb11321e9971a50daf8

  doCheck = !stdenv.hostPlatform.isDarwin;



  passthru = {

    tests.version = testers.testVersion {

pkgs/tools/system/nvtop/default.nix

+5 −1
Original line number Diff line number Diff line
@@ -10,10 +10,14 @@ let 
    "nvidia"

    "panfrost"

    "panthor"

    "v3d"

  ];

  # these GPU families are partially supported upstream, they are also tricky to build in nixpkgs

  # volunteers with specific hardware needed to build and test these package variants

  additionalGPUFamilies = [ "ascend" ];

  additionalGPUFamilies = [

    "ascend"

    "tpu"

  ];

  defaultSupport = builtins.listToAttrs (

    # apple can only build on darwin, and it can't build everything else, and vice versa

    builtins.map (gpu: {

pkgs/top-level/aliases.nix

+0 −5
Original line number Diff line number Diff line
@@ -1248,11 +1248,6 @@ mapAliases { 
  nux = throw "nux has been removed because it has been abandoned for 4 years"; # Added 2025-03-22

  nvidia-podman = throw "podman should use the Container Device Interface (CDI) instead. See https://web.archive.org/web/20240729183805/https://docs.nvidia.com/datacenter/cloud-native/container-toolkit/latest/install-guide.html#configuring-podman"; # Added 2024-08-02

  nvidia-thrust = throw "nvidia-thrust has been removed because the project was deprecated; use cudaPackages.cuda_cccl";

  nvtop = lib.warnOnInstantiate "nvtop has been renamed to nvtopPackages.full" nvtopPackages.full; # Added 2024-02-25

  nvtop-amd = lib.warnOnInstantiate "nvtop-amd has been renamed to nvtopPackages.amd" nvtopPackages.amd; # Added 2024-02-25

  nvtop-nvidia = lib.warnOnInstantiate "nvtop-nvidia has been renamed to nvtopPackages.nvidia" nvtopPackages.nvidia; # Added 2024-02-25

  nvtop-intel = lib.warnOnInstantiate "nvtop-intel has been renamed to nvtopPackages.intel" nvtopPackages.intel; # Added 2024-02-25

  nvtop-msm = lib.warnOnInstantiate "nvtop-msm has been renamed to nvtopPackages.msm" nvtopPackages.msm; # Added 2024-02-25



  ### O ###