diff --git a/pkgs/development/cuda-modules/aliases.nix b/pkgs/development/cuda-modules/aliases.nix
index 7f28f2c76d47..4e25dc44ca9a 100644
--- a/pkgs/development/cuda-modules/aliases.nix
+++ b/pkgs/development/cuda-modules/aliases.nix
@@ -1,18 +1,14 @@
-# Packges which have been deprecated or removed from cudaPackages
+# Packages which have been deprecated or removed from cudaPackages
 final: prev:
 let
-  mkRenamed =
-    oldName: newName: newPkg:
-    final.lib.warn "cudaPackages.${oldName} is deprecated, use ${newName} instead" newPkg;
-in
-{
+  inherit (prev.lib) warn;
+  inherit (builtins) mapAttrs;
 
-  # Deprecated: an alias kept for compatibility. Consider removing after 24.05
-  autoFixElfFiles = mkRenamed "autoFixElfFiles" "pkgs.autoFixElfFiles" final.pkgs.autoFixElfFiles; # Added 2024-03-30
-  autoAddDriverRunpath =
-    mkRenamed "autoAddDriverRunpath" "pkgs.autoAddDriverRunpath"
-      final.pkgs.autoAddDriverRunpath; # Added 2024-03-30
-  autoAddOpenGLRunpathHook =
-    mkRenamed "autoAddOpenGLRunpathHook" "pkgs.autoAddDriverRunpathHook"
-      final.pkgs.autoAddDriverRunpath; # Added 2024-03-30
+  mkRenamed =
+    oldName:
+    { path, package }:
+    warn "cudaPackages.${oldName} is deprecated, use ${path} instead" package;
+in
+mapAttrs mkRenamed {
+  # A comment to prevent empty { } from collapsing into a single line
 }
diff --git a/pkgs/development/python-modules/torch/default.nix b/pkgs/development/python-modules/torch/default.nix
index 088f5f1d2790..afc1fd6e74e1 100644
--- a/pkgs/development/python-modules/torch/default.nix
+++ b/pkgs/development/python-modules/torch/default.nix
@@ -201,8 +201,11 @@ let
       ]);
     "MPI cudatoolkit does not match cudaPackages.cudatoolkit" =
       MPISupport && cudaSupport && (mpi.cudatoolkit != cudaPackages.cudatoolkit);
+    # This used to be a deep package set comparison between cudaPackages and
+    # effectiveMagma.cudaPackages, making torch too strict in cudaPackages.
+    # In particular, this triggered warnings from cuda's `aliases.nix`
     "Magma cudaPackages does not match cudaPackages" =
-      cudaSupport && (effectiveMagma.cudaPackages != cudaPackages);
+      cudaSupport && (effectiveMagma.cudaPackages.cudaVersion != cudaPackages.cudaVersion);
     "Rocm support is currently broken because `rocmPackages.hipblaslt` is unpackaged. (2024-06-09)" = rocmSupport;
   };
 in