From f08c835bf9ae4e577f1fb8faf3b6aba2063c8f94 Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Tue, 17 Mar 2026 16:24:10 +0100
Subject: [PATCH] lib.newScope: allow overriding callPackage

---
 lib/customisation.nix              | 7 +++++--
 pkgs/top-level/octave-packages.nix | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/lib/customisation.nix b/lib/customisation.nix
index dfdb64cbf3e2..ce00e364ba76 100644
--- a/lib/customisation.nix
+++ b/lib/customisation.nix
@@ -631,9 +631,12 @@ rec {
   makeScope =
     newScope: f:
     let
-      self = f self // {
-        newScope = scope: newScope (self // scope);
+      self = {
         callPackage = self.newScope { };
+      }
+      // f self
+      // {
+        newScope = scope: newScope (self // scope);
         overrideScope = g: makeScope newScope (extends g f);
         packages = f;
       };
diff --git a/pkgs/top-level/octave-packages.nix b/pkgs/top-level/octave-packages.nix
index e9a8a13608ec..f0214bdbe83d 100644
--- a/pkgs/top-level/octave-packages.nix
+++ b/pkgs/top-level/octave-packages.nix
@@ -56,7 +56,7 @@ makeScope newScope (
   in
   {
 
-    inherit callPackage buildOctavePackage computeRequiredOctavePackages;
+    inherit buildOctavePackage computeRequiredOctavePackages;
 
     inherit (callPackage ../development/interpreters/octave/hooks { })
       writeRequiredOctavePackagesHook