diff options
| author | Peter Hoeg <peter@hoeg.com> | 2020-01-13 17:01:42 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-13 17:01:42 +0800 |
| commit | f799342531455ca6201e9bc1e842be4d6a18f2ab (patch) | |
| tree | b8ebf535850192d1df04118ddfd8ad4f41d69d68 | |
| parent | 04172da17b25a314c82a492f35a6c99d36ef3879 (diff) | |
| parent | ac289636de480f5a9b5913efbcc0f4408c35dcde (diff) | |
| download | nixlib-f799342531455ca6201e9bc1e842be4d6a18f2ab.tar nixlib-f799342531455ca6201e9bc1e842be4d6a18f2ab.tar.gz nixlib-f799342531455ca6201e9bc1e842be4d6a18f2ab.tar.bz2 nixlib-f799342531455ca6201e9bc1e842be4d6a18f2ab.tar.lz nixlib-f799342531455ca6201e9bc1e842be4d6a18f2ab.tar.xz nixlib-f799342531455ca6201e9bc1e842be4d6a18f2ab.tar.zst nixlib-f799342531455ca6201e9bc1e842be4d6a18f2ab.zip | |
Merge pull request #77602 from peterhoeg/fix_emacs
emacs: 2 minor hotfixes
| -rw-r--r-- | pkgs/applications/editors/emacs-modes/elpa-generated.nix | 8 | ||||
| -rw-r--r-- | pkgs/applications/editors/emacs-modes/melpa-packages.nix | 5 |
2 files changed, 9 insertions, 4 deletions
diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix index bfbddb6fc37c..9d4fb66f7322 100644 --- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix @@ -3236,10 +3236,10 @@ elpaBuild { pname = "undo-tree"; ename = "undo-tree"; - version = "0.7"; + version = "0.7.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/undo-tree-0.7.el"; - sha256 = "0mc5spiqx20z8vh8b24dp9hqj27h5bm5wqk0ga7c6s6mp69r72h4"; + url = "https://elpa.gnu.org/packages/undo-tree-0.7.2.el"; + sha256 = "0gdqh5rkgwlancbjx5whgl5gqkdipdkspkl2bqmrq70sgg5ahrcc"; }; packageRequires = []; meta = { @@ -3734,4 +3734,4 @@ license = lib.licenses.free; }; }) {}; - } \ No newline at end of file + } diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix index e15da80b3b1b..5c9456b76a63 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix @@ -111,6 +111,11 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac flycheck-rtags = fix-rtags super.flycheck-rtags; + gnuplot = super.gnuplot.overrideAttrs (old: { + nativeBuildInputs = + (old.nativeBuildInputs or []) ++ [ pkgs.autoreconfHook ]; + }); + pdf-tools = super.pdf-tools.overrideAttrs(old: { nativeBuildInputs = [ external.pkgconfig ]; buildInputs = with external; old.buildInputs ++ [ autoconf automake libpng zlib poppler ]; |