diff options
-rw-r--r-- | doc/builders/packages/emacs.section.md | 4 | ||||
-rw-r--r-- | doc/languages-frameworks/cuda.section.md | 2 | ||||
-rw-r--r-- | pkgs/build-support/emacs/wrapper.nix | 2 | ||||
-rw-r--r-- | pkgs/development/compilers/rust/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/interpreters/php/generic.nix | 2 | ||||
-rw-r--r-- | pkgs/development/lisp-modules/nix-cl.nix | 2 | ||||
-rw-r--r-- | pkgs/development/lisp-modules/packages.nix | 2 | ||||
-rw-r--r-- | pkgs/development/lisp-modules/ql.nix | 2 | ||||
-rw-r--r-- | pkgs/top-level/cuda-packages.nix | 2 | ||||
-rw-r--r-- | pkgs/top-level/ocaml-packages.nix | 2 |
10 files changed, 11 insertions, 11 deletions
diff --git a/doc/builders/packages/emacs.section.md b/doc/builders/packages/emacs.section.md index a202606966c03..d46f890858f4a 100644 --- a/doc/builders/packages/emacs.section.md +++ b/doc/builders/packages/emacs.section.md @@ -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. -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 overrides = self: super: rec { haskell-mode = self.melpaPackages.haskell-mode; ... }; -((emacsPackagesFor emacs).overrideScope' overrides).withPackages +((emacsPackagesFor emacs).overrideScope overrides).withPackages (p: with p; [ # here both these package will use haskell-mode of our own choice ghc-mod diff --git a/doc/languages-frameworks/cuda.section.md b/doc/languages-frameworks/cuda.section.md index b7f1f19546a78..2d680ea6b3b6a 100644 --- a/doc/languages-frameworks/cuda.section.md +++ b/doc/languages-frameworks/cuda.section.md @@ -30,7 +30,7 @@ package set to make it the default. This guarantees you get a consistent package set. ```nix mypkg = let - cudaPackages = cudaPackages_11_5.overrideScope' (final: prev: { + cudaPackages = cudaPackages_11_5.overrideScope (final: prev: { cudnn = prev.cudnn_8_3; }}); in callPackage { inherit cudaPackages; }; diff --git a/pkgs/build-support/emacs/wrapper.nix b/pkgs/build-support/emacs/wrapper.nix index a3842dec69974..ecfcc0cd52c5f 100644 --- a/pkgs/build-support/emacs/wrapper.nix +++ b/pkgs/build-support/emacs/wrapper.nix @@ -21,7 +21,7 @@ set which contains `emacs.pkgs.withPackages`. For example, to override `emacs.pkgs.emacs.pkgs.withPackages`, ``` let customEmacsPackages = - emacs.pkgs.overrideScope' (self: super: { + emacs.pkgs.overrideScope (self: super: { # use a custom version of emacs emacs = ...; # use the unstable MELPA version of magit diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix index 35f5ab79c106b..77c8b3d592fa7 100644 --- a/pkgs/development/compilers/rust/default.nix +++ b/pkgs/development/compilers/rust/default.nix @@ -48,7 +48,7 @@ in # Like `buildRustPackages`, but may also contain prebuilt binaries to # break cycle. Just like `bootstrapTools` for nixpkgs as a whole, # nothing in the final package set should refer to this. - bootstrapRustPackages = self.buildRustPackages.overrideScope' (_: _: + bootstrapRustPackages = self.buildRustPackages.overrideScope (_: _: lib.optionalAttrs (stdenv.buildPlatform == stdenv.hostPlatform) (selectRustPackage buildPackages).packages.prebuilt); bootRustPlatform = makeRustPlatform bootstrapRustPackages; diff --git a/pkgs/development/interpreters/php/generic.nix b/pkgs/development/interpreters/php/generic.nix index 4a563d4fd70ec..d60d0cdf1fd17 100644 --- a/pkgs/development/interpreters/php/generic.nix +++ b/pkgs/development/interpreters/php/generic.nix @@ -85,7 +85,7 @@ let php-packages = (callPackage ../../../top-level/php-packages.nix { phpPackage = phpWithExtensions; - }).overrideScope' packageOverrides; + }).overrideScope packageOverrides; allExtensionFunctions = prevExtensionFunctions ++ [ extensions ]; enabledExtensions = diff --git a/pkgs/development/lisp-modules/nix-cl.nix b/pkgs/development/lisp-modules/nix-cl.nix index b8e0af0cc2bd2..3f45f58110e90 100644 --- a/pkgs/development/lisp-modules/nix-cl.nix +++ b/pkgs/development/lisp-modules/nix-cl.nix @@ -299,7 +299,7 @@ let }: let spec = { inherit pkg faslExt program flags asdf; }; - pkgs = (commonLispPackagesFor spec).overrideScope' packageOverrides; + pkgs = (commonLispPackagesFor spec).overrideScope packageOverrides; withPackages = lispWithPackages pkgs; withOverrides = packageOverrides: wrapLisp { diff --git a/pkgs/development/lisp-modules/packages.nix b/pkgs/development/lisp-modules/packages.nix index 5d26f33f45e57..a10c1201dca88 100644 --- a/pkgs/development/lisp-modules/packages.nix +++ b/pkgs/development/lisp-modules/packages.nix @@ -50,7 +50,7 @@ let # lispLibs ofpackages in this file. ql = quicklispPackagesFor spec; - packages = ql.overrideScope' (self: super: { + packages = ql.overrideScope (self: super: { cffi = let jna = pkgs.fetchMavenArtifact { diff --git a/pkgs/development/lisp-modules/ql.nix b/pkgs/development/lisp-modules/ql.nix index 33b3753a83e87..17e92b75ae57a 100644 --- a/pkgs/development/lisp-modules/ql.nix +++ b/pkgs/development/lisp-modules/ql.nix @@ -266,4 +266,4 @@ let lib.optionalAttrs (builtins.pathExists ./imported.nix) (pkgs.callPackage ./imported.nix { inherit build-asdf-system; }); -in qlpkgs.overrideScope' overrides +in qlpkgs.overrideScope overrides diff --git a/pkgs/top-level/cuda-packages.nix b/pkgs/top-level/cuda-packages.nix index 2044d74cab79d..b8e1e5dfc767a 100644 --- a/pkgs/top-level/cuda-packages.nix +++ b/pkgs/top-level/cuda-packages.nix @@ -70,4 +70,4 @@ let cutensorExtension ]); -in (scope.overrideScope' composedExtension) +in (scope.overrideScope composedExtension) diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 984c5791ea041..e3b1cad80da67 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -1803,7 +1803,7 @@ let ### End ### - })).overrideScope' liftJaneStreet; + })).overrideScope liftJaneStreet; in let inherit (pkgs) callPackage; in rec { |