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

emacs-packages: Drop irony package

Browse Source 
Use auto-generated melpa package
This commit is contained in:
adisbladis 2019-08-04 20:53:10 +01:00
parent af70adbc89
commit 978b34622b
No known key found for this signature in database
GPG Key ID: 110BFAD44C6249B7
2 changed files with 28 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -105,6 +105,27 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
# upstream issue: missing file header
initsplit = markBroken super.initsplit;
irony = super.irony.overrideAttrs(old: {
preConfigure = ''
cd server
'';
preBuild = ''
make
'';
postInstall = ''
mkdir -p $out
mv $out/share/emacs/site-lisp/elpa/*/server/bin $out
rm -rf $out/share/emacs/site-lisp/elpa/*/server
'';
preCheck = ''
cd source/server
'';
dontUseCmakeBuildDir = true;
doCheck = true;
packageRequires = [ self.emacs ];
nativeBuildInputs = [ external.cmake external.llvmPackages.llvm external.llvmPackages.clang ];
});
# tries to write a log file to $HOME
insert-shebang = super.insert-shebang.overrideAttrs (attrs: {
HOME = "/tmp";
@ -356,6 +377,13 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
# Expects bash to be at /bin/bash
helm-rtags = markBroken super.helm-rtags;
# Fails with "package does not untar cleanly into ..."
irony = shared.irony.overrideAttrs(old: {
meta = old.meta // {
broken = true;
};
});
magit-annex = super.magit-annex.overrideAttrs (attrs: {
# searches for Git at build time
nativeBuildInputs =

39
pkgs/top-level/emacs-packages.nix
View File

@ -181,45 +181,6 @@ let
icicles = callPackage ../applications/editors/emacs-modes/icicles { };
irony = melpaBuild rec {
pname = "irony";
ename = "irony";
version = "20190516";
src = fetchFromGitHub {
owner = "Sarcasm";
repo = "irony-mode";
rev = "c3ae899b61124a747ebafc705086345e460ac08e";
sha256 = "06ld83vzyklfmrfi6pp893mvlnhacv9if75c9pbipjvy6nwfb63r";
};
recipe = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3cfa28c7314fa57fa9a3aaaadf9ef83f8ae541a9/recipes/irony";
sha256 = "1xcxrdrs7imi31nxpszgpaywq4ivni75hrdl4zzrf103xslqpl8a";
name = "recipe";
};
preConfigure = ''
cd server
'';
preBuild = ''
make
'';
postInstall = ''
mkdir -p $out
mv $out/share/emacs/site-lisp/elpa/*/server/bin $out
rm -rf $out/share/emacs/site-lisp/elpa/*/server
'';
preCheck = ''
cd source/server
'';
dontUseCmakeBuildDir = true;
doCheck = true;
packageRequires = [ emacs ];
nativeBuildInputs = [ external.cmake external.llvmPackages.llvm external.llvmPackages.clang ];
meta = {
homepage = "https://melpa.org/#/irony";
license = lib.licenses.gpl3;
};
};
rtags = melpaBuild rec {
pname = "rtags";
version = "2.12";