diff --git a/doc/languages-frameworks/chicken.section.md b/doc/languages-frameworks/chicken.section.md index 16b00b3f5b5d..d1e12e2cccbc 100644 --- a/doc/languages-frameworks/chicken.section.md +++ b/doc/languages-frameworks/chicken.section.md @@ -60,13 +60,13 @@ all the other eggs: ```nix let - myChickenPackages = pkgs.chickenPackages.overrideScope' (self: super: { + myChickenPackages = pkgs.chickenPackages.overrideScope (self: super: { # The chicken package itself can be overridden to effect the whole ecosystem. # chicken = super.chicken.overrideAttrs { # src = ... # }; - chickenEggs = super.chickenEggs.overrideScope' (eggself: eggsuper: { + chickenEggs = super.chickenEggs.overrideScope (eggself: eggsuper: { srfi-180 = eggsuper.srfi-180.overrideAttrs { # path to a local copy of srfi-180 src = <...>; diff --git a/lib/customisation.nix b/lib/customisation.nix index bcdc94f3c4c3..99c02ddeea89 100644 --- a/lib/customisation.nix +++ b/lib/customisation.nix @@ -543,10 +543,6 @@ rec { newScope = scope: newScope (self // scope); callPackage = self.newScope {}; overrideScope = g: makeScope newScope (extends g f); - # Remove after 24.11 is released. - overrideScope' = g: warnIf (isInOldestRelease 2311) - "`overrideScope'` (from `lib.makeScope`) has been renamed to `overrideScope`." - (makeScope newScope (extends g f)); packages = f; }; in self; diff --git a/pkgs/top-level/release-attrpaths-superset.nix b/pkgs/top-level/release-attrpaths-superset.nix index 293c856488a2..22ebb4f6f920 100644 --- a/pkgs/top-level/release-attrpaths-superset.nix +++ b/pkgs/top-level/release-attrpaths-superset.nix @@ -80,7 +80,6 @@ let mkDerivation = true; overrideDerivation = true; overrideScope = true; - overrideScope' = true; # Special case: lib/types.nix leaks into a lot of nixos-related # derivations, and does not eval deeply.