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: 69bac39af760
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 5afaf77e58f0
Choose a head ref
  • 4 commits
  • 1 file changed
  • 1 contributor

Commits on Apr 24, 2020

  1. emacsPackages.kubernetes-evil: Fix build

    @adisbladis
    adisbladis committed Apr 24, 2020
    Copy the full SHA
    d8a6536 View commit details

  2. emacsPackages.kapacitor: Fix build

    @adisbladis
    adisbladis committed Apr 24, 2020
    Copy the full SHA
    12085f3 View commit details

  3. emacsPackages.mandoku: Fix build

    @adisbladis
    adisbladis committed Apr 24, 2020
    Copy the full SHA
    b77f951 View commit details

  4. emacsPackages.mandoku-tls: Fix build

    @adisbladis
    adisbladis committed Apr 24, 2020
    Copy the full SHA
    5afaf77 View commit details
Showing with 24 additions and 0 deletions.
  1. +24 −0 pkgs/applications/editors/emacs-modes/melpa-packages.nix
24 changes: 24 additions & 0 deletions pkgs/applications/editors/emacs-modes/melpa-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -164,6 +164,18 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac

ivy-rtags = fix-rtags super.ivy-rtags;

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

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

magit = super.magit.overrideAttrs (attrs: {
# searches for Git at build time
nativeBuildInputs =
@@ -302,12 +314,24 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
(attrs.nativeBuildInputs or []) ++ [ external.git ];
});

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

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

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

# upstream issue: missing file header
mhc = super.mhc.override {
inherit (self.melpaPackages) calfw;