Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: d67b8a9eb1b3
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 803aa128b1e8
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Oct 18, 2019

  1. emacsPackages.evil-escape: fix build

    @peterhoeg
    peterhoeg committed Oct 18, 2019
    Copy the full SHA
    29f4fd4 View commit details

Commits on Oct 21, 2019

  1. Merge pull request #71351 from peterhoeg/f/emacs_evil_escape 

    emacsPackages.evil-escape: fix build
    @peterhoeg
    peterhoeg authored Oct 21, 2019
    Copy the full SHA
    803aa12 View commit details
Showing with 9 additions and 0 deletions.
  1. +9 −0 pkgs/applications/editors/emacs-modes/melpa-packages.nix
9 changes: 9 additions & 0 deletions pkgs/applications/editors/emacs-modes/melpa-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -85,6 +85,15 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
stripDebugList = [ "share" ];
});

# https://github.com/syl20bnr/evil-escape/pull/86
evil-escape = super.evil-escape.overrideAttrs (attrs: {
postPatch = ''
substituteInPlace evil-escape.el \
--replace ' ;;; evil' ';;; evil'
'';
packageRequires = with self; [ evil ];
});

evil-magit = super.evil-magit.overrideAttrs (attrs: {
# searches for Git at build time
nativeBuildInputs =