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

Merge branch 'emacs-packages'

Browse Source
This commit is contained in:
Thomas Tuegel 2015-12-22 06:56:16 -06:00
commit de66e60acf
4 changed files with 15 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/editors/emacs-modes/elpa-packages.nix
View File

@ -35,7 +35,7 @@ let
pname = name; pname = name;
inherit (recipe) version; inherit (recipe) version;
inherit src; inherit src;
deps = packageRequires =
let lookupDep = d: self."${d}" or null; let lookupDep = d: self."${d}" or null;
in map lookupDep recipe.deps; in map lookupDep recipe.deps;
meta = { meta = {

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

@ -40,7 +40,7 @@ let
pname = name; pname = name;
inherit (recipe) version; inherit (recipe) version;
inherit src; inherit src;
deps = packageRequires =
let lookupDep = d: self."${d}" or null; let lookupDep = d: self."${d}" or null;
in map lookupDep recipe.deps; in map lookupDep recipe.deps;
meta = { meta = {
@ -62,5 +62,10 @@ self:
meta = (args.meta or {}) // { broken = true; }; meta = (args.meta or {}) // { broken = true; };
}); });
}; };
melpaPackages = super // {
# broken upstream
ack-menu = markBroken super.ack-menu;
};
in in
super // { melpaPackages = super; } melpaPackages // { inherit melpaPackages; }

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

@ -42,7 +42,7 @@ let
pname = name; pname = name;
inherit (recipe) version; inherit (recipe) version;
inherit src; inherit src;
deps = packageRequires =
let lookupDep = d: self."${d}" or null; let lookupDep = d: self."${d}" or null;
in map lookupDep recipe.deps; in map lookupDep recipe.deps;
meta = { meta = {
@ -64,5 +64,10 @@ self:
meta = (args.meta or {}) // { broken = true; }; meta = (args.meta or {}) // { broken = true; };
}); });
}; };
melpaStablePackages = super // {
# broken upstream
ack-menu = markBroken super.ack-menu;
};
in in
super // { melpaStablePackages = super; } melpaStablePackages // { inherit melpaStablePackages; }

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

@ -84,21 +84,6 @@ let
}; };
}; };
ace-jump-mode = melpaBuild rec {
pname = "ace-jump-mode";
version = "20140616";
src = fetchFromGitHub {
owner = "winterTTr";
repo = pname;
rev = "8351e2df4fbbeb2a4003f2fb39f46d33803f3dac";
sha256 = "17axrgd99glnl6ma4ls3k01ysdqmiqr581wnrbsn3s4gp53mm2x6";
};
meta = {
description = "Advanced cursor movements mode for Emacs";
license = gpl3Plus;
};
};
tablist = melpaBuild rec { tablist = melpaBuild rec {
pname = "tablist"; pname = "tablist";
inherit (pdf-tools) src version; inherit (pdf-tools) src version;