public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #72243 from urkud/emacs-rtags

Browse Source 
emacs-*-rtags: use upstream package names
This commit is contained in:
adisbladis 2019-11-01 16:34:14 +00:00 committed by GitHub
commit 0f76051d67
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/applications/editors/emacs-modes/manual-packages.nix
View File

@ -104,21 +104,6 @@
icicles = callPackage ./icicles { }; icicles = callPackage ./icicles { };
rtags = melpaBuild {
inherit (external.rtags) version src meta;
pname = "rtags";
dontConfigure = true;
propagatedUserEnvPkgs = [ external.rtags ];
recipe = pkgs.writeText "recipe" ''
(rtags
:repo "andersbakken/rtags" :fetcher github
:files ("src/*.el"))
'';
};
lib-requires = lib-requires =
callPackage ./lib-requires { }; callPackage ./lib-requires { };

35
pkgs/applications/editors/emacs-modes/melpa-packages.nix
View File

@ -26,6 +26,17 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
}); });
}) else null; }) else null;
externalSrc = pkg : epkg : if pkg != null then pkg.override (args : {
melpaBuild = drv : args.melpaBuild (drv // {
inherit (epkg) src version;
propagatedUserEnvPkgs = [ epkg ];
});
}) else null;
fix-rtags = pkg : if pkg != null then dontConfigure (externalSrc pkg external.rtags)
else null;
generateMelpa = lib.makeOverridable ({ generateMelpa = lib.makeOverridable ({
archiveJson ? ./recipes-archive-melpa.json archiveJson ? ./recipes-archive-melpa.json
}: let }: let
@ -36,7 +47,7 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
overrides = rec { overrides = rec {
shared = rec { shared = rec {
# Expects bash to be at /bin/bash # Expects bash to be at /bin/bash
ac-rtags = markBroken super.ac-rtags; ac-rtags = fix-rtags super.ac-rtags;
airline-themes = super.airline-themes.override { airline-themes = super.airline-themes.override {
inherit (self.melpaPackages) powerline; inherit (self.melpaPackages) powerline;
@ -61,8 +72,7 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
]; ];
}); });
# Expects bash to be at /bin/bash company-rtags = fix-rtags super.company-rtags;
company-rtags = markBroken super.company-rtags;
easy-kill-extras = super.easy-kill-extras.override { easy-kill-extras = super.easy-kill-extras.override {
inherit (self.melpaPackages) easy-kill; inherit (self.melpaPackages) easy-kill;
@ -104,8 +114,7 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
inherit (self.melpaPackages) ess ctable popup; inherit (self.melpaPackages) ess ctable popup;
}; };
# Expects bash to be at /bin/bash flycheck-rtags = fix-rtags super.flycheck-rtags;
flycheck-rtags = markBroken super.flycheck-rtags;
pdf-tools = super.pdf-tools.overrideAttrs(old: { pdf-tools = super.pdf-tools.overrideAttrs(old: {
nativeBuildInputs = [ external.pkgconfig ]; nativeBuildInputs = [ external.pkgconfig ];
@ -119,11 +128,8 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
}); });
# Build same version as Haskell package # Build same version as Haskell package
hindent = super.hindent.overrideAttrs (attrs: { hindent = (externalSrc super.hindent external.hindent).overrideAttrs (attrs: {
version = external.hindent.version;
src = external.hindent.src;
packageRequires = [ self.haskell-mode ]; packageRequires = [ self.haskell-mode ];
propagatedUserEnvPkgs = [ external.hindent ];
}); });
irony = super.irony.overrideAttrs (old: { irony = super.irony.overrideAttrs (old: {
@ -156,8 +162,7 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
HOME = "/tmp"; HOME = "/tmp";
}); });
# Expects bash to be at /bin/bash ivy-rtags = fix-rtags super.ivy-rtags;
ivy-rtags = markBroken super.ivy-rtags;
magit = super.magit.overrideAttrs (attrs: { magit = super.magit.overrideAttrs (attrs: {
# searches for Git at build time # searches for Git at build time
@ -218,6 +223,8 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
# part of a larger package # part of a larger package
notmuch = dontConfigure super.notmuch; notmuch = dontConfigure super.notmuch;
rtags = dontConfigure (externalSrc super.rtags external.rtags);
shm = super.shm.overrideAttrs (attrs: { shm = super.shm.overrideAttrs (attrs: {
propagatedUserEnvPkgs = [ external.structured-haskell-mode ]; propagatedUserEnvPkgs = [ external.structured-haskell-mode ];
}); });
@ -317,8 +324,7 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
# upstream issue: doesn't build # upstream issue: doesn't build
eterm-256color = markBroken super.eterm-256color; eterm-256color = markBroken super.eterm-256color;
# Expects bash to be at /bin/bash helm-rtags = fix-rtags super.helm-rtags;
helm-rtags = markBroken super.helm-rtags;
# upstream issue: missing file header # upstream issue: missing file header
qiita = markBroken super.qiita; qiita = markBroken super.qiita;
@ -362,8 +368,7 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
(attrs.nativeBuildInputs or []) ++ [ external.git ]; (attrs.nativeBuildInputs or []) ++ [ external.git ];
}); });
# Expects bash to be at /bin/bash helm-rtags = fix-rtags super.helm-rtags;
helm-rtags = markBroken super.helm-rtags;
orgit = orgit =
(super.orgit.overrideAttrs (attrs: { (super.orgit.overrideAttrs (attrs: {