diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-08-14 18:01:33 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-08-14 18:01:33 +0000 |
commit | af2c148bc35ddc8a4606b9e43b5e2eceda763cc8 (patch) | |
tree | d4294c07557294597abb405d45e3baf969336394 /doc | |
parent | a732780b6f0157b58f2b62ed19e461f6af88e996 (diff) | |
parent | 674c2b19204b195c2960264fe01cc6d99a7ac882 (diff) |
Merge staging-next into staging
Diffstat (limited to 'doc')
-rw-r--r-- | doc/builders/packages/emacs.section.md | 4 | ||||
-rw-r--r-- | doc/languages-frameworks/cuda.section.md | 2 |
2 files changed, 3 insertions, 3 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; }; |