diff options
| author | adisbladis <adisbladis@gmail.com> | 2019-08-09 08:57:11 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-09 08:57:11 +0100 |
| commit | fe9fe5ef5723ea6edb363ae0a3398baab77998d6 (patch) | |
| tree | 25c9d9f8500a21d8af7252de6824a472727782ed | |
| parent | 95dec03601c003c372ea077ae359cb87ad89ce52 (diff) | |
| parent | 02e13a04787a102435764220eec427fdd358c0a4 (diff) | |
| download | nixpkgs-fe9fe5ef5723ea6edb363ae0a3398baab77998d6.tar nixpkgs-fe9fe5ef5723ea6edb363ae0a3398baab77998d6.tar.gz nixpkgs-fe9fe5ef5723ea6edb363ae0a3398baab77998d6.tar.bz2 nixpkgs-fe9fe5ef5723ea6edb363ae0a3398baab77998d6.tar.lz nixpkgs-fe9fe5ef5723ea6edb363ae0a3398baab77998d6.tar.xz nixpkgs-fe9fe5ef5723ea6edb363ae0a3398baab77998d6.tar.zst nixpkgs-fe9fe5ef5723ea6edb363ae0a3398baab77998d6.zip | |
Merge pull request #66362 from mdorman/melpa-stable-fixes
emacsPackages: melpa-stable fixes for new infrastructure
| -rw-r--r-- | pkgs/applications/editors/emacs-modes/melpa-packages.nix | 50 |
1 files changed, 25 insertions, 25 deletions
diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix index 920572198d0..24e541f2695 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix @@ -146,6 +146,12 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac (attrs.nativeBuildInputs or []) ++ [ external.git ]; }); + magit-annex = super.magit-annex.overrideAttrs (attrs: { + # searches for Git at build time + nativeBuildInputs = + (attrs.nativeBuildInputs or []) ++ [ external.git ]; + }); + magit-todos = super.magit-todos.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = @@ -158,6 +164,24 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac (attrs.nativeBuildInputs or []) ++ [ external.git ]; }); + magit-gitflow = super.magit-gitflow.overrideAttrs (attrs: { + # searches for Git at build time + nativeBuildInputs = + (attrs.nativeBuildInputs or []) ++ [ external.git ]; + }); + + magithub = super.magithub.overrideAttrs (attrs: { + # searches for Git at build time + nativeBuildInputs = + (attrs.nativeBuildInputs or []) ++ [ external.git ]; + }); + + magit-svn = super.magit-svn.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 = @@ -295,7 +319,7 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac xml-plus = super."xml+"; }; - stable = { + stable = shared // { # part of a larger package # upstream issue: missing package version cmake-mode = markBroken (dontConfigure super.cmake-mode); @@ -384,30 +408,6 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac }; }); - magit-annex = super.magit-annex.overrideAttrs (attrs: { - # searches for Git at build time - nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; - }); - - magit-gitflow = super.magit-gitflow.overrideAttrs (attrs: { - # searches for Git at build time - nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; - }); - - magithub = super.magithub.overrideAttrs (attrs: { - # searches for Git at build time - nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; - }); - - magit-svn = super.magit-svn.overrideAttrs (attrs: { - # searches for Git at build time - nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; - }); - orgit = (super.orgit.overrideAttrs (attrs: { # searches for Git at build time |