diff options
| author | Alexey Lebedeff <binarin@binarin.ru> | 2017-11-06 11:03:30 +0100 |
|---|---|---|
| committer | Alexey Lebedeff <binarin@binarin.ru> | 2017-11-06 11:03:30 +0100 |
| commit | 5ce0f5aa38477a5d7700bdb1f086c328d826f2b5 (patch) | |
| tree | dfe659abe432415d3d89724450d2aefe6921555f /pkgs/top-level | |
| parent | eece8755d1f5da1a5be319edf37c1a6244289010 (diff) | |
| download | nixlib-5ce0f5aa38477a5d7700bdb1f086c328d826f2b5.tar nixlib-5ce0f5aa38477a5d7700bdb1f086c328d826f2b5.tar.gz nixlib-5ce0f5aa38477a5d7700bdb1f086c328d826f2b5.tar.bz2 nixlib-5ce0f5aa38477a5d7700bdb1f086c328d826f2b5.tar.lz nixlib-5ce0f5aa38477a5d7700bdb1f086c328d826f2b5.tar.xz nixlib-5ce0f5aa38477a5d7700bdb1f086c328d826f2b5.tar.zst nixlib-5ce0f5aa38477a5d7700bdb1f086c328d826f2b5.zip | |
emacs-packages: Cleanup and document for overrides
This removes some stale code that was a no-op for some time and adds some docs/examples to help people with explicitly and consistently choosing versions of some emacs packages (to help with problems similar to #27083).
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/emacs-packages.nix | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ebb9831d3ff0..bb559038b3e7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14409,8 +14409,6 @@ with pkgs; emacs25Packages = emacsPackagesGen emacs25 pkgs.emacs25Packages; emacsPackagesNgGen = emacs: import ./emacs-packages.nix { - overrides = (config.emacsPackageOverrides or (p: {})) pkgs; - inherit lib newScope stdenv; inherit fetchFromGitHub fetchgit fetchhg fetchurl; inherit emacs texinfo makeWrapper runCommand; diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index 4ff8d23424c7..57610c3827cc 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -32,9 +32,7 @@ # `meta` with `platforms` and `homepage` set to something you are # unlikely to want to override for most packages -{ overrides - -, lib, newScope, stdenv, fetchurl, fetchgit, fetchFromGitHub, fetchhg, runCommand +{ lib, newScope, stdenv, fetchurl, fetchgit, fetchFromGitHub, fetchhg, runCommand , emacs, texinfo, lndir, makeWrapper , trivialBuild |