Unverified Commit f08c835b authored by quantenzitrone's avatar quantenzitrone
Browse files

lib.newScope: allow overriding callPackage

parent 784d11dc

lib/customisation.nix

+5 −2
Original line number Diff line number Diff line
@@ -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;

      };

pkgs/top-level/octave-packages.nix

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ makeScope newScope ( 
  in

  {



    inherit callPackage buildOctavePackage computeRequiredOctavePackages;

    inherit buildOctavePackage computeRequiredOctavePackages;



    inherit (callPackage ../development/interpreters/octave/hooks { })

      writeRequiredOctavePackagesHook