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

Merge pull request #15295 from mdorman/emacs-updates

Browse Source 
emacs-packages: various updates
This commit is contained in:
Thomas Tuegel 2016-05-09 05:19:50 -05:00
commit 65c9e06248
14 changed files with 9364 additions and 8669 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
pkgs/applications/editors/emacs-modes/dash/default.nix
View File

@ -1,24 +0,0 @@
{stdenv, fetchurl, emacs}:
let
version = "2.12.1";
in
stdenv.mkDerivation {
name = "emacs-dash-${version}";
src = fetchurl {
url = "https://github.com/magnars/dash.el/archive/${version}.tar.gz";
sha256 = "082jl7mp4x063bpj5ad2pc5125k0d6p7rb89gcj7ny3lma9h2ij1";
};
buildInputs = [ emacs ];
buildPhase = ''
emacs -L . --batch -f batch-byte-compile *.el
'';
installPhase = ''
install -d $out/share/emacs/site-lisp
install *.el *.elc $out/share/emacs/site-lisp
'';
}

54
pkgs/applications/editors/emacs-modes/elpa-generated.nix
View File

@ -81,10 +81,10 @@
aggressive-indent = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "aggressive-indent";
version = "1.6";
version = "1.7";
src = fetchurl {
url = "https://elpa.gnu.org/packages/aggressive-indent-1.6.el";
sha256 = "1xnxc2x1hbhkbqhp9p3c9azrdm6mr6czqc9pl63phjp9dbslny7i";
url = "https://elpa.gnu.org/packages/aggressive-indent-1.7.el";
sha256 = "0z2zsw0qnzcabsz2frfsjhfg7qa4nbmprrd41yjfxq62d12wg70m";
};
packageRequires = [ cl-lib emacs ];
meta = {
@ -135,10 +135,10 @@
arbitools = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
elpaBuild {
pname = "arbitools";
version = "0.70";
version = "0.71";
src = fetchurl {
url = "https://elpa.gnu.org/packages/arbitools-0.70.el";
sha256 = "129ykqhx26adw0x26wzb4biyr5pnjgqmycsabsag2hzxjd7c92gl";
url = "https://elpa.gnu.org/packages/arbitools-0.71.el";
sha256 = "1ghf5yla126n7xpn2sc2vg7q8arp7iv2z5f9r9l38vxm6dvnxp50";
};
packageRequires = [ cl-lib ];
meta = {
@ -228,10 +228,10 @@
}) {};
beacon = callPackage ({ elpaBuild, fetchurl, lib, seq }: elpaBuild {
pname = "beacon";
version = "1.2.1";
version = "1.3.0";
src = fetchurl {
url = "https://elpa.gnu.org/packages/beacon-1.2.1.el";
sha256 = "00i0p7azkkk4jpz6dnbkc4rhcvm1q7dg953874ph50fjihwqi1m6";
url = "https://elpa.gnu.org/packages/beacon-1.3.0.el";
sha256 = "00hab8w01p43iscpr0hh1s2w80ara2y8d5ccz37i2nl54gj8lpw3";
};
packageRequires = [ seq ];
meta = {
@ -242,10 +242,10 @@
bug-hunter = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib, seq }:
elpaBuild {
pname = "bug-hunter";
version = "1.3";
version = "1.3.1";
src = fetchurl {
url = "https://elpa.gnu.org/packages/bug-hunter-1.3.el";
sha256 = "1j1d9nml2wl3yj7llykq5k1a81kzb3r4rbn695c0853fk036gk5x";
url = "https://elpa.gnu.org/packages/bug-hunter-1.3.1.el";
sha256 = "0xplsnmj144r90vxxkmpdxlaq6gyx4ca6iklq60wd0w05fw9q02x";
};
packageRequires = [ cl-lib seq ];
meta = {
@ -442,15 +442,15 @@
license = lib.licenses.free;
};
}) {};
debbugs = callPackage ({ elpaBuild, fetchurl, lib, soap-client }:
debbugs = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib, soap-client }:
elpaBuild {
pname = "debbugs";
version = "0.9.3";
version = "0.9.5";
src = fetchurl {
url = "https://elpa.gnu.org/packages/debbugs-0.9.3.tar";
sha256 = "0qj1b5ax80bi5kz6jfi4f5kpirkkc2li8zf18fj86q5ayh3rsgnz";
url = "https://elpa.gnu.org/packages/debbugs-0.9.5.tar";
sha256 = "1m23rghdykx1fvji6in0xp0bxhjcf7ynm14nl4fhiki2nhhwczxh";
};
packageRequires = [ soap-client ];
packageRequires = [ cl-lib soap-client ];
meta = {
homepage = "https://elpa.gnu.org/packages/debbugs.html";
license = lib.licenses.free;
@ -1257,10 +1257,10 @@
}) {};
org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
pname = "org";
version = "20160425";
version = "20160502";
src = fetchurl {
url = "https://elpa.gnu.org/packages/org-20160425.tar";
sha256 = "1slrmy8kpapp36lwk9md7rakl1fw8gi377rfff0ma8n7k5xy7b2a";
url = "https://elpa.gnu.org/packages/org-20160502.tar";
sha256 = "0li067na4p0k9r4nr6a2vfqygvlmzsdgm5kgg2p60lsvydh43fvw";
};
packageRequires = [];
meta = {
@ -1757,6 +1757,20 @@
license = lib.licenses.free;
};
}) {};
validate = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "validate";
version = "0.3";
src = fetchurl {
url = "https://elpa.gnu.org/packages/validate-0.3.el";
sha256 = "0nq917217ax5zykzaybv7diz1vgl3y6r8vi7hmz3lzm5dl90jy3m";
};
packageRequires = [ cl-lib emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/validate.html";
license = lib.licenses.free;
};
}) {};
vlf = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
pname = "vlf";
version = "1.7";

32
pkgs/applications/editors/emacs-modes/flycheck/default.nix
View File

@ -1,32 +0,0 @@
{ stdenv, fetchFromGitHub, emacs, let-alist, dash, texinfo }:
stdenv.mkDerivation rec {
name = "flycheck-0.22-64-g90dbc2d";
src = fetchFromGitHub {
owner = "flycheck";
repo = "flycheck";
rev = "90dbc2d";
sha256 = "08bg4jps6hjldbcrvqarrwdv4xzirm5pns5s0331wm0sc47yvbli";
};
buildInputs = [ emacs texinfo ];
buildPhase = ''
emacs -L ${let-alist}/share/emacs/site-lisp -L ${dash}/share/emacs/site-lisp --batch -f batch-byte-compile flycheck.el
makeinfo --force --no-split -o doc/flycheck.info doc/flycheck.texi
'';
installPhase = ''
mkdir -p $out/share/emacs/site-lisp $out/share/info
mv flycheck.el flycheck.elc $out/share/emacs/site-lisp/
mv "doc/"*.info $out/share/info/
'';
meta = {
inherit (src.meta) homepage;
description = "Modern on-the-fly syntax checking for GNU Emacs";
license = stdenv.lib.licenses.gpl3Plus;
maintainers = with stdenv.lib.maintainers; [ simons ];
};
}

29
pkgs/applications/editors/emacs-modes/git-modes/default.nix
View File

@ -1,29 +0,0 @@
{ stdenv, fetchFromGitHub, emacs }:
let
version = "1.2.0";
in
stdenv.mkDerivation {
name = "git-modes-${version}";
src = fetchFromGitHub {
owner = "magit";
repo = "git-modes";
rev = version;
sha256 = "1ipr51v7nhbbgxbbz0fp3i78ypp73kyxgc4ni8nnr7yirjhsksfd";
};
buildInputs = [ emacs ];
installPhase = ''
mkdir -p $out/share/emacs/site-lisp
mv *.el *.elc $out/share/emacs/site-lisp/
'';
meta = {
homepage = "https://github.com/magit/git-modes";
description = "Emacs modes for various Git-related files";
license = stdenv.lib.licenses.gpl3Plus;
maintainers = with stdenv.lib.maintainers; [ simons ];
};
}

54
pkgs/applications/editors/emacs-modes/magit/default.nix
View File

@ -1,54 +0,0 @@
{ stdenv, fetchFromGitHub, emacs, texinfo, gitModes, git, dash }:
let
version = "2.3.0";
in
stdenv.mkDerivation {
name = "magit-${version}";
src = fetchFromGitHub {
owner = "magit";
repo = "magit";
rev = version;
sha256 = "1zbx1ky1481lkvfjr4k23q7jdrk9ji9v5ghj88qib36vbmzfwww8";
};
buildInputs = [ emacs texinfo git ];
propagatedUserEnvPkgs = [ gitModes dash ];
configurePhase = ''
makeFlagsArray=(
PREFIX="$out"
lispdir="$out/share/emacs/site-lisp"
DASH_DIR="${dash}/share/emacs/site-lisp"
VERSION="${version}"
)
make ''${makeFlagsArray[@]} -C lisp magit-version.el
cp lisp/magit-version.el Documentation/
cp lisp/magit-version.el .
'';
doCheck = false; # 2 out of 15 tests fails, not sure why
checkTarget = "test";
preCheck = "export EMAIL='Joe Doe <joe.doe@example.org>'";
meta = {
homepage = "https://github.com/magit/magit";
description = "Magit, an Emacs interface to Git";
license = stdenv.lib.licenses.gpl3Plus;
longDescription = ''
With Magit, you can inspect and modify your Git repositories with
Emacs. You can review and commit the changes you have made to the
tracked files, for example, and you can browse the history of past
changes. There is support for cherry picking, reverting, merging,
rebasing, and other common Git operations.
Magit is not a complete interface to Git; it just aims to make the
most common Git operations convenient. Thus, Magit will likely not
save you from learning Git itself.
'';
maintainers = with stdenv.lib.maintainers; [ simons ];
};
}

14122
pkgs/applications/editors/emacs-modes/melpa-generated.nix
View File

File diff suppressed because it is too large Load Diff

3429
pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
View File

File diff suppressed because it is too large Load Diff

28
pkgs/applications/editors/emacs-modes/org-generated.nix Normal file
View File

@ -0,0 +1,28 @@
{ callPackage }: {
org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
pname = "org";
version = "20160502";
src = fetchurl {
url = "http://orgmode.org/elpa/org-20160502.tar";
sha256 = "0ranc2qiw6g6qja0jh1dvh06k6waagkiir2q2zla5d54brw4fg5a";
};
packageRequires = [];
meta = {
homepage = "https://elpa.gnu.org/packages/org.html";
license = lib.licenses.free;
};
}) {};
org-plus-contrib = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
pname = "org-plus-contrib";
version = "20160502";
src = fetchurl {
url = "http://orgmode.org/elpa/org-plus-contrib-20160502.tar";
sha256 = "1znqh4pp9dlqmmdjhgy6vb880hq3cl4q6nmv48x8n5may159mvm0";
};
packageRequires = [];
meta = {
homepage = "https://elpa.gnu.org/packages/org-plus-contrib.html";
license = lib.licenses.free;
};
}) {};
}

37
pkgs/applications/editors/emacs-modes/org-packages.nix Normal file
View File

@ -0,0 +1,37 @@
/*
# Updating
To update the list of packages from ELPA,
1. Clone https://github.com/ttuegel/emacs2nix
2. Run `./org-packages.sh` from emacs2nix
3. Copy the new org-packages.json file into Nixpkgs
4. `git commit -m "org-packages $(date -Idate)"`
*/
{ fetchurl, lib, stdenv, texinfo }:
self:
let
imported = import ./org-generated.nix {
inherit (self) callPackage;
};
super = imported;
markBroken = pkg: pkg.override {
elpaBuild = args: self.elpaBuild (args // {
meta = (args.meta or {}) // { broken = true; };
});
};
overrides = {
};
orgPackages = super // overrides;
in orgPackages // { inherit orgPackages; }

30
pkgs/applications/editors/emacs-modes/pcache/default.nix
View File

@ -1,30 +0,0 @@
{ stdenv, fetchgit, emacs }:
stdenv.mkDerivation rec {
name = "pcache-0.2.3";
src = fetchgit {
url = "https://github.com/sigma/pcache.git";
rev = "fa8f863546e2e8f2fc0a70f5cc766a7f584e01b6";
sha256 = "f7cdad5a729b24f96ec69db4adfd19daf45c27aaf3a0267385b252cb2e59daa0";
};
buildInputs = [ emacs ];
buildPhase = ''
emacs --batch -f batch-byte-compile pcache.el
'';
installPhase = ''
install -d $out/share/emacs/site-lisp
install pcache.el pcache.elc $out/share/emacs/site-lisp
'';
meta = {
description = "Persistent caching for Emacs";
homepage = https://github.com/sigma/pcache.el;
license = stdenv.lib.licenses.gpl2Plus;
platforms = stdenv.lib.platforms.all;
};
}

23
pkgs/applications/editors/emacs-modes/s/default.nix
View File

@ -1,23 +0,0 @@
{stdenv, fetchurl, emacs}:
let version = "1.9.0";
in stdenv.mkDerivation {
name = "emacs-s-${version}";
src = fetchurl {
url = "https://github.com/magnars/s.el/archive/${version}.tar.gz";
sha256 = "1gah2k577gvnmxlpw7zrz0jr571vghzhdv2hbgchlgah07czd091";
};
buildInputs = [ emacs ];
buildPhase = ''
emacs -L . --batch -f batch-byte-compile *.el
'';
installPhase = ''
install -d $out/share/emacs/site-lisp
install *.el *.elc $out/share/emacs/site-lisp
'';
}

32
pkgs/applications/editors/emacs-modes/xml-rpc/default.nix
View File

@ -1,32 +0,0 @@
{stdenv, fetchurl, emacs}:
stdenv.mkDerivation rec {
name = "xml-rpc-1.6.8";
src = fetchurl {
url = https://launchpadlibrarian.net/40270196/xml-rpc.el;
sha256 = "0i8hf90yhrjwqrv7q1f2g1cff6ld8apqkka42fh01wkdys1fbm7b";
};
phases = [ "buildPhase" "installPhase"];
buildInputs = [ emacs ];
buildPhase = ''
cp $src xml-rpc.el
emacs --batch -f batch-byte-compile xml-rpc.el
'';
installPhase = ''
install -d $out/share/emacs/site-lisp
install xml-rpc.el* $out/share/emacs/site-lisp
'';
meta = {
description = "Elisp implementation of clientside XML-RPC";
homepage = https://launchpad.net/xml-rpc-el;
license = stdenv.lib.licenses.gpl3Plus;
platforms = stdenv.lib.platforms.all;
};
}

14
pkgs/top-level/all-packages.nix
View File

@ -12248,8 +12248,6 @@ in
darcsum = callPackage ../applications/editors/emacs-modes/darcsum { };
dash = callPackage ../applications/editors/emacs-modes/dash { };
# ecb = callPackage ../applications/editors/emacs-modes/ecb { };
emacsClangCompleteAsync = callPackage ../applications/editors/emacs-modes/emacs-clang-complete-async { };
@ -12266,8 +12264,6 @@ in
ess = callPackage ../applications/editors/emacs-modes/ess { };
flycheck = callPackage ../applications/editors/emacs-modes/flycheck { };
flymakeCursor = callPackage ../applications/editors/emacs-modes/flymake-cursor { };
gh = callPackage ../applications/editors/emacs-modes/gh { };
@ -12276,8 +12272,6 @@ in
gist = callPackage ../applications/editors/emacs-modes/gist { };
gitModes = callPackage ../applications/editors/emacs-modes/git-modes { };
haskellMode = callPackage ../applications/editors/emacs-modes/haskell { };
hsc3Mode = callPackage ../applications/editors/emacs-modes/hsc3 { };
@ -12306,8 +12300,6 @@ in
loremIpsum = callPackage ../applications/editors/emacs-modes/lorem-ipsum { };
magit = callPackage ../applications/editors/emacs-modes/magit { };
markdownMode = callPackage ../applications/editors/emacs-modes/markdown-mode { };
maudeMode = callPackage ../applications/editors/emacs-modes/maude { };
@ -12330,8 +12322,6 @@ in
org2blog = callPackage ../applications/editors/emacs-modes/org2blog { };
pcache = callPackage ../applications/editors/emacs-modes/pcache { };
phpMode = callPackage ../applications/editors/emacs-modes/php { };
prologMode = callPackage ../applications/editors/emacs-modes/prolog { };
@ -12360,8 +12350,6 @@ in
rudel = callPackage ../applications/editors/emacs-modes/rudel { };
s = callPackage ../applications/editors/emacs-modes/s { };
sbtMode = callPackage ../applications/editors/emacs-modes/sbt-mode { };
scalaMode1 = callPackage ../applications/editors/emacs-modes/scala-mode/v1.nix { };
@ -12377,8 +12365,6 @@ in
writeGood = callPackage ../applications/editors/emacs-modes/writegood { };
xmlRpc = callPackage ../applications/editors/emacs-modes/xml-rpc { };
cask = callPackage ../applications/editors/emacs-modes/cask { };
};

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

@ -59,6 +59,10 @@ let
inherit lib;
};
orgPackages = import ../applications/editors/emacs-modes/org-packages.nix {
inherit fetchurl lib stdenv texinfo;
};
emacsWithPackages = import ../build-support/emacs/wrapper.nix {
inherit lib lndir makeWrapper stdenv;
};
@ -761,20 +765,6 @@ let
};
};
# Deprecated in favor of git-commit
git-commit-mode = melpaBuild rec {
pname = "git-commit-mode";
version = "1.0.0";
src = fetchFromGitHub {
owner = "magit";
repo = "git-modes";
rev = version;
sha256 = "12a1xs3w2dp1a55qhc01dwjkavklgfqnn3yw85dhi4jdz8r8j7m0";
};
files = [ "git-commit-mode.el" ];
meta = git-commit.meta;
};
git-gutter = melpaBuild rec {
pname = "git-gutter";
version = "20150930";
@ -793,20 +783,6 @@ let
#TODO git-gutter-fringe
# Deprecated in favor of git-rebase
git-rebase-mode = melpaBuild rec {
pname = "git-rebase-mode";
version = "1.0.0";
src = fetchFromGitHub {
owner = "magit";
repo = "git-modes";
rev = version;
sha256 = "12a1xs3w2dp1a55qhc01dwjkavklgfqnn3yw85dhi4jdz8r8j7m0";
};
files = [ "git-rebase-mode.el" ];
meta = git-rebase.meta;
};
git-timemachine = melpaBuild rec {
pname = "git-timemachine";
version = "2.3";
@ -1134,85 +1110,6 @@ let
};
};
magit = melpaBuild rec {
pname = "magit";
version = "2.3.1";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = version;
sha256 = "01x9kahr3szzc00wlfrihl4x28yrq065fq4rpzx9dxiksayk24pd";
};
packageRequires = [ dash git-commit magit-popup with-editor ];
fileSpecs = [ "lisp/magit-utils.el"
"lisp/magit-section.el"
"lisp/magit-git.el"
"lisp/magit-mode.el"
"lisp/magit-process.el"
"lisp/magit-core.el"
"lisp/magit-diff.el"
"lisp/magit-wip.el"
"lisp/magit-apply.el"
"lisp/magit-log.el"
"lisp/magit.el"
"lisp/magit-sequence.el"
"lisp/magit-commit.el"
"lisp/magit-remote.el"
"lisp/magit-bisect.el"
"lisp/magit-stash.el"
"lisp/magit-blame.el"
"lisp/magit-ediff.el"
"lisp/magit-extras.el"
"Documentation/magit.texi"
"Documentation/AUTHORS.md"
"COPYING"
];
meta = {
description = "Emacs interface for Git that aspires to be a complete Git porcelain";
license = gpl3Plus;
};
};
git-commit = melpaBuild rec {
pname = "git-commit";
version = magit.version;
src = magit.src;
packageRequires = [ dash with-editor ];
fileSpecs = [ "lisp/git-commit.el" ];
meta = magit.meta // {
description = "Emacs mode for editig Git commit messages";
};
};
git-rebase = melpaBuild rec {
pname = "git-rebase";
version = magit.version;
src = magit.src;
packageRequires = [ dash with-editor magit ];
fileSpecs = [ "lisp/git-rebase.el" ];
meta = magit.meta // {
description = "Emacs major-mode which makes editing rebase scripts more fun";
};
};
magit-popup = melpaBuild rec {
pname = "magit-popup";
version = magit.version;
src = magit.src;
packageRequires = [ dash with-editor ];
fileSpecs = [ "Documentation/magit-popup.texi" "lisp/magit-popup.el" ];
meta = magit.meta // {
description = "Infix arguments with feedback in a buffer library for Emacs";
};
};
with-editor = melpaBuild rec {
pname = "with-editor";
version = magit.version;
src = magit.src;
packageRequires = [ async dash ];
fileSpecs = [ "Documentation/with-editor.texi" "lisp/with-editor.el" ];
meta = magit.meta // {
description = "Use the Emacsclient as EDITOR of child processes library for Emacs";
};
};
markdown-toc = melpaBuild rec {
pname = "markdown-toc";
version = "0.0.8";
@ -1299,19 +1196,6 @@ let
};
};
org-plus-contrib = elpaBuild rec {
pname = "org-plus-contrib";
version = "20150406";
src = fetchurl {
url = "http://orgmode.org/elpa/${pname}-${version}.tar";
sha256 = "1ny2myg4rm75ab2gl5rqrwy7h53q0vv18df8gk3zv13kljj76c6i";
};
meta = {
description = "Notes, TODO lists, projects, and authoring in plain-text with Emacs";
license = gpl3Plus;
};
};
org-trello = melpaBuild rec {
pname = "org-trello";
version = "0.7.5";
@ -1843,5 +1727,6 @@ in
// melpaPackages self
// elpaPackages self
// melpaStablePackages self
// orgPackages self
// packagesFun self
)