diff --git a/pkgs/development/libraries/intel-oneapi/toolkit.nix b/pkgs/by-name/in/intel-oneapi-toolkit/package.nix
similarity index 99%
rename from pkgs/development/libraries/intel-oneapi/toolkit.nix
rename to pkgs/by-name/in/intel-oneapi-toolkit/package.nix
index 6f9b8895582f..51770f0e3404 100644
--- a/pkgs/development/libraries/intel-oneapi/toolkit.nix
+++ b/pkgs/by-name/in/intel-oneapi-toolkit/package.nix
@@ -179,7 +179,7 @@ intel-oneapi.mkIntelOneApi (finalAttrs: {
 
   passthru.updateScript = intel-oneapi.mkUpdateScript {
     inherit (finalAttrs) pname;
-    file = "toolkit.nix";
+    file = "package.nix";
     downloadPage = "https://www.intel.com/content/www/us/en/developer/tools/oneapi/oneapi-toolkit-download.html";
   };
 
diff --git a/pkgs/development/libraries/intel-oneapi/stdenv.nix b/pkgs/by-name/in/intel-oneapi-toolkit/stdenv.nix
similarity index 100%
rename from pkgs/development/libraries/intel-oneapi/stdenv.nix
rename to pkgs/by-name/in/intel-oneapi-toolkit/stdenv.nix
diff --git a/pkgs/development/libraries/intel-oneapi/tests.nix b/pkgs/by-name/in/intel-oneapi-toolkit/tests.nix
similarity index 100%
rename from pkgs/development/libraries/intel-oneapi/tests.nix
rename to pkgs/by-name/in/intel-oneapi-toolkit/tests.nix
diff --git a/pkgs/development/libraries/intel-oneapi/default.nix b/pkgs/development/libraries/intel-oneapi/default.nix
index 789726f32fdb..bc3797e1cec1 100644
--- a/pkgs/development/libraries/intel-oneapi/default.nix
+++ b/pkgs/development/libraries/intel-oneapi/default.nix
@@ -1,6 +1,5 @@
 {
   lib,
-  callPackage,
   stdenv,
   ncurses5,
   bc,
@@ -184,14 +183,3 @@
     });
 
 }
-// (
-  let
-    toolkit = callPackage ./toolkit.nix { };
-  in
-  {
-    inherit toolkit;
-    # Intel merged the Base Toolkit and HPC Toolkit into intel-oneapi-toolkit with the 2026.0 release.
-    base = lib.warn "'intel-oneapi.base' and 'intel-oneapi.hpc' have been merged upstream into a single package. Please switch to 'intel-oneapi-toolkit'" toolkit;
-    hpc = lib.warn "'intel-oneapi.base' and 'intel-oneapi.hpc' have been merged upstream into a single package. Please switch to 'intel-oneapi-toolkit'" toolkit;
-  }
-)
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e7536b720e20..a91d94416170 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1642,7 +1642,14 @@ with pkgs;
 
   coreboot-configurator = libsForQt5.callPackage ../tools/misc/coreboot-configurator { };
 
-  intel-oneapi = recurseIntoAttrs (callPackage ../development/libraries/intel-oneapi { });
+  intel-oneapi = recurseIntoAttrs (
+    (callPackage ../development/libraries/intel-oneapi { })
+    // {
+      # Intel merged the Base and HPC Toolkits into intel-oneapi-toolkit with the 2026.0 release.
+      base = lib.warn "'intel-oneapi.base' and 'intel-oneapi.hpc' have been merged upstream into a single package. Please switch to 'intel-oneapi-toolkit'" intel-oneapi-toolkit;
+      hpc = lib.warn "'intel-oneapi.base' and 'intel-oneapi.hpc' have been merged upstream into a single package. Please switch to 'intel-oneapi-toolkit'" intel-oneapi-toolkit;
+    }
+  );
 
   intelLlvmStdenv = intel-llvm.stdenv;