diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2017-05-03 09:59:49 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2017-05-03 09:59:49 +0200 |
| commit | c520e79842c91b432ffc8535cbecc90878392bea (patch) | |
| tree | 84e4bff63619aa04b8053323d1939ab8e977dbb7 /pkgs/build-support | |
| parent | 7527355840b6398e63fa5104088a0c13da0ab33f (diff) | |
| parent | 664ff4069cb87aa4ab94f0e885ed1dab127bee15 (diff) | |
| download | nixpkgs-c520e79842c91b432ffc8535cbecc90878392bea.tar nixpkgs-c520e79842c91b432ffc8535cbecc90878392bea.tar.gz nixpkgs-c520e79842c91b432ffc8535cbecc90878392bea.tar.bz2 nixpkgs-c520e79842c91b432ffc8535cbecc90878392bea.tar.lz nixpkgs-c520e79842c91b432ffc8535cbecc90878392bea.tar.xz nixpkgs-c520e79842c91b432ffc8535cbecc90878392bea.tar.zst nixpkgs-c520e79842c91b432ffc8535cbecc90878392bea.zip | |
Merge remote-tracking branch 'upstream/master' into HEAD
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/emacs/wrapper.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/build-support/emacs/wrapper.nix b/pkgs/build-support/emacs/wrapper.nix index b13def07bb8..4fb77ccfe21 100644 --- a/pkgs/build-support/emacs/wrapper.nix +++ b/pkgs/build-support/emacs/wrapper.nix @@ -21,7 +21,7 @@ set which contains `emacsWithPackages`. For example, to override `emacsPackagesNg.emacsWithPackages`, ``` let customEmacsPackages = - emacsPackagesNg.override (super: self: { + emacsPackagesNg.overrideScope (super: self: { # use a custom version of emacs emacs = ...; # use the unstable MELPA version of magit |