treewide: overrideScope' -> overrideScope

`lib.makeScope` `overrideScope'` has been renamed to `overrideScope`

`fd --type f | xargs sd --string-mode "overrideScope'" "overrideScope"`
This commit is contained in:
Artturin 2023-08-14 08:21:26 +03:00
parent 3c1f82f99e
commit b93da3f4b7
10 changed files with 11 additions and 11 deletions

View File

@ -103,14 +103,14 @@ You can install it like any other packages via `nix-env -iA myEmacs`. However, t
This provides a fairly full Emacs start file. It will load in addition to the user's personal config. You can always disable it by passing `-q` to the Emacs command. This provides a fairly full Emacs start file. It will load in addition to the user's personal config. You can always disable it by passing `-q` to the Emacs command.
Sometimes `emacs.pkgs.withPackages` is not enough, as this package set has some priorities imposed on packages (with the lowest priority assigned to Melpa Unstable, and the highest for packages manually defined in `pkgs/top-level/emacs-packages.nix`). But you can't control these priorities when some package is installed as a dependency. You can override it on a per-package-basis, providing all the required dependencies manually, but it's tedious and there is always a possibility that an unwanted dependency will sneak in through some other package. To completely override such a package, you can use `overrideScope'`. Sometimes `emacs.pkgs.withPackages` is not enough, as this package set has some priorities imposed on packages (with the lowest priority assigned to Melpa Unstable, and the highest for packages manually defined in `pkgs/top-level/emacs-packages.nix`). But you can't control these priorities when some package is installed as a dependency. You can override it on a per-package-basis, providing all the required dependencies manually, but it's tedious and there is always a possibility that an unwanted dependency will sneak in through some other package. To completely override such a package, you can use `overrideScope`.
```nix ```nix
overrides = self: super: rec { overrides = self: super: rec {
haskell-mode = self.melpaPackages.haskell-mode; haskell-mode = self.melpaPackages.haskell-mode;
... ...
}; };
((emacsPackagesFor emacs).overrideScope' overrides).withPackages ((emacsPackagesFor emacs).overrideScope overrides).withPackages
(p: with p; [ (p: with p; [
# here both these package will use haskell-mode of our own choice # here both these package will use haskell-mode of our own choice
ghc-mod ghc-mod

View File

@ -30,7 +30,7 @@ package set to make it the default. This guarantees you get a consistent package
set. set.
```nix ```nix
mypkg = let mypkg = let
cudaPackages = cudaPackages_11_5.overrideScope' (final: prev: { cudaPackages = cudaPackages_11_5.overrideScope (final: prev: {
cudnn = prev.cudnn_8_3; cudnn = prev.cudnn_8_3;
}}); }});
in callPackage { inherit cudaPackages; }; in callPackage { inherit cudaPackages; };

View File

@ -21,7 +21,7 @@ set which contains `emacs.pkgs.withPackages`. For example, to override
`emacs.pkgs.emacs.pkgs.withPackages`, `emacs.pkgs.emacs.pkgs.withPackages`,
``` ```
let customEmacsPackages = let customEmacsPackages =
emacs.pkgs.overrideScope' (self: super: { emacs.pkgs.overrideScope (self: super: {
# use a custom version of emacs # use a custom version of emacs
emacs = ...; emacs = ...;
# use the unstable MELPA version of magit # use the unstable MELPA version of magit

View File

@ -48,7 +48,7 @@ in
# Like `buildRustPackages`, but may also contain prebuilt binaries to # Like `buildRustPackages`, but may also contain prebuilt binaries to
# break cycle. Just like `bootstrapTools` for nixpkgs as a whole, # break cycle. Just like `bootstrapTools` for nixpkgs as a whole,
# nothing in the final package set should refer to this. # nothing in the final package set should refer to this.
bootstrapRustPackages = self.buildRustPackages.overrideScope' (_: _: bootstrapRustPackages = self.buildRustPackages.overrideScope (_: _:
lib.optionalAttrs (stdenv.buildPlatform == stdenv.hostPlatform) lib.optionalAttrs (stdenv.buildPlatform == stdenv.hostPlatform)
(selectRustPackage buildPackages).packages.prebuilt); (selectRustPackage buildPackages).packages.prebuilt);
bootRustPlatform = makeRustPlatform bootstrapRustPackages; bootRustPlatform = makeRustPlatform bootstrapRustPackages;

View File

@ -85,7 +85,7 @@ let
php-packages = (callPackage ../../../top-level/php-packages.nix { php-packages = (callPackage ../../../top-level/php-packages.nix {
phpPackage = phpWithExtensions; phpPackage = phpWithExtensions;
}).overrideScope' packageOverrides; }).overrideScope packageOverrides;
allExtensionFunctions = prevExtensionFunctions ++ [ extensions ]; allExtensionFunctions = prevExtensionFunctions ++ [ extensions ];
enabledExtensions = enabledExtensions =

View File

@ -299,7 +299,7 @@ let
}: }:
let let
spec = { inherit pkg faslExt program flags asdf; }; spec = { inherit pkg faslExt program flags asdf; };
pkgs = (commonLispPackagesFor spec).overrideScope' packageOverrides; pkgs = (commonLispPackagesFor spec).overrideScope packageOverrides;
withPackages = lispWithPackages pkgs; withPackages = lispWithPackages pkgs;
withOverrides = packageOverrides: withOverrides = packageOverrides:
wrapLisp { wrapLisp {

View File

@ -50,7 +50,7 @@ let
# lispLibs ofpackages in this file. # lispLibs ofpackages in this file.
ql = quicklispPackagesFor spec; ql = quicklispPackagesFor spec;
packages = ql.overrideScope' (self: super: { packages = ql.overrideScope (self: super: {
cffi = let cffi = let
jna = pkgs.fetchMavenArtifact { jna = pkgs.fetchMavenArtifact {

View File

@ -266,4 +266,4 @@ let
lib.optionalAttrs (builtins.pathExists ./imported.nix) lib.optionalAttrs (builtins.pathExists ./imported.nix)
(pkgs.callPackage ./imported.nix { inherit build-asdf-system; }); (pkgs.callPackage ./imported.nix { inherit build-asdf-system; });
in qlpkgs.overrideScope' overrides in qlpkgs.overrideScope overrides

View File

@ -70,4 +70,4 @@ let
cutensorExtension cutensorExtension
]); ]);
in (scope.overrideScope' composedExtension) in (scope.overrideScope composedExtension)

View File

@ -1803,7 +1803,7 @@ let
### End ### ### End ###
})).overrideScope' liftJaneStreet; })).overrideScope liftJaneStreet;
in let inherit (pkgs) callPackage; in rec in let inherit (pkgs) callPackage; in rec
{ {