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: 7f1288b6ab49
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: d834a4a4fa50
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Apr 14, 2019

  1. treemacs-magit: needs git at build time

    @liff
    liff committed Apr 14, 2019
    Copy the full SHA
    974f64f View commit details

Commits on Aug 1, 2019

  1. Merge pull request #59451 from liff/emacs/treemacs-magit-fix 

    treemacs-magit: needs git at build time
    @infinisil
    infinisil authored Aug 1, 2019
    Copy the full SHA
    d834a4a View commit details
Showing with 6 additions and 0 deletions.
  1. +6 −0 pkgs/applications/editors/emacs-modes/melpa-packages.nix
6 changes: 6 additions & 0 deletions pkgs/applications/editors/emacs-modes/melpa-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -233,6 +233,12 @@ self:
# upstream issue: missing file header
textmate = markBroken super.textmate;

treemacs-magit = super.treemacs-magit.overrideAttrs (attrs: {
# searches for Git at build time
nativeBuildInputs =
(attrs.nativeBuildInputs or []) ++ [ external.git ];
});

# missing OCaml
utop = markBroken super.utop;