dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

lib/customisation: remove overrideScope'

Browse Source 
Let's follow through on the comment.
This commit is contained in:
Wolfgang Walther 2024-11-17 11:17:01 +01:00
parent f6cd55f50b
commit af10dd2014
No known key found for this signature in database
GPG Key ID: B39893FA5F65CAE1
3 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/languages-frameworks/chicken.section.md
View File

@ -60,13 +60,13 @@ all the other eggs:
```nix ```nix
let 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. # The chicken package itself can be overridden to effect the whole ecosystem.
# chicken = super.chicken.overrideAttrs { # chicken = super.chicken.overrideAttrs {
# src = ... # src = ...
# }; # };
chickenEggs = super.chickenEggs.overrideScope' (eggself: eggsuper: { chickenEggs = super.chickenEggs.overrideScope (eggself: eggsuper: {
srfi-180 = eggsuper.srfi-180.overrideAttrs { srfi-180 = eggsuper.srfi-180.overrideAttrs {
# path to a local copy of srfi-180 # path to a local copy of srfi-180
src = <...>; src = <...>;

4
lib/customisation.nix
View File

@ -543,10 +543,6 @@ rec {
newScope = scope: newScope (self // scope); newScope = scope: newScope (self // scope);
callPackage = self.newScope {}; callPackage = self.newScope {};
overrideScope = g: makeScope newScope (extends g f); 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; packages = f;
}; };
in self; in self;

1
pkgs/top-level/release-attrpaths-superset.nix
View File

@ -80,7 +80,6 @@ let
mkDerivation = true; mkDerivation = true;
overrideDerivation = true; overrideDerivation = true;
overrideScope = true; overrideScope = true;
overrideScope' = true;
# Special case: lib/types.nix leaks into a lot of nixos-related # Special case: lib/types.nix leaks into a lot of nixos-related
# derivations, and does not eval deeply. # derivations, and does not eval deeply.