diff options
| author | Doron Behar <doron.behar@gmail.com> | 2024-03-20 09:58:40 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-20 09:58:40 +0200 |
| commit | 86209dfc0d02667b6db6b8272d301ade97c3718d (patch) | |
| tree | b3b257163cb2655ae7a8f88c8fab6934f22e286a /pkgs/top-level | |
| parent | 5c0f7fbdf8328f3db2769d4dc656b9568ef790cb (diff) | |
| parent | 7c3a7384184273aec77ba583a81b04b1340a7696 (diff) | |
| download | nixlib-86209dfc0d02667b6db6b8272d301ade97c3718d.tar nixlib-86209dfc0d02667b6db6b8272d301ade97c3718d.tar.gz nixlib-86209dfc0d02667b6db6b8272d301ade97c3718d.tar.bz2 nixlib-86209dfc0d02667b6db6b8272d301ade97c3718d.tar.lz nixlib-86209dfc0d02667b6db6b8272d301ade97c3718d.tar.xz nixlib-86209dfc0d02667b6db6b8272d301ade97c3718d.tar.zst nixlib-86209dfc0d02667b6db6b8272d301ade97c3718d.zip | |
Merge pull request #291305 from gbtb/nvtop-310
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/aliases.nix | 5 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 26 |
2 files changed, 6 insertions, 25 deletions
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 1dacb80bfacf..69dc7130ff1f 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -828,6 +828,11 @@ mapAliases ({ noto-fonts-extra = noto-fonts; # Added 2023-04-08 NSPlist = nsplist; # Added 2024-01-05 nvidia-thrust = throw "nvidia-thrust has been removed because the project was deprecated; use cudaPackages.cuda_cccl"; + nvtop = lib.warn "nvtop has been renamed to nvtopPackages.full" nvtopPackages.full; # Added 2024-02-25 + nvtop-amd = lib.warn "nvtop-amd has been renamed to nvtopPackages.amd" nvtopPackages.amd; # Added 2024-02-25 + nvtop-nvidia = lib.warn "nvtop-nvidia has been renamed to nvtopPackages.nvidia" nvtopPackages.nvidia; # Added 2024-02-25 + nvtop-intel = lib.warn "nvtop-intel has been renamed to nvtopPackages.intel" nvtopPackages.intel; # Added 2024-02-25 + nvtop-msm = lib.warn "nvtop-msm has been renamed to nvtopPackages.msm" nvtopPackages.msm; # Added 2024-02-25 ### O ### diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 97a439998706..c9bca9f2acfa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23899,31 +23899,7 @@ with pkgs; nvitop = callPackage ../tools/system/nvitop { }; - nvtop = callPackage ../tools/system/nvtop { }; - nvtop-amd = (callPackage ../tools/system/nvtop { - amd = true; - intel = false; - msm = false; - nvidia = false; - }).overrideAttrs { pname = "nvtop-amd"; }; - nvtop-intel = (callPackage ../tools/system/nvtop { - amd = false; - intel = true; - msm = false; - nvidia = false; - }).overrideAttrs { pname = "nvtop-intel"; }; - nvtop-msm = (callPackage ../tools/system/nvtop { - amd = false; - intel = false; - msm = true; - nvidia = false; - }).overrideAttrs { pname = "nvtop-msm"; }; - nvtop-nvidia = (callPackage ../tools/system/nvtop { - amd = false; - intel = false; - msm = false; - nvidia = true; - }).overrideAttrs { pname = "nvtop-nvidia"; }; + nvtopPackages = recurseIntoAttrs (import ../tools/system/nvtop { inherit callPackage; }); ocl-icd = callPackage ../development/libraries/ocl-icd { }; |