Merge branch 'master' of github.com:NixOS/nixpkgs

This commit is contained in:
Shea Levy 2016-10-04 10:16:13 -04:00
commit e70a2badc2
4 changed files with 1999 additions and 1321 deletions

View file

@ -471,10 +471,10 @@
debbugs = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib, soap-client }:
elpaBuild {
pname = "debbugs";
version = "0.10";
version = "0.11";
src = fetchurl {
url = "https://elpa.gnu.org/packages/debbugs-0.10.tar";
sha256 = "0vrsa70h6ipsq01qr9qzlaw1704xqviby321ri6w69wkwlcjkpin";
url = "https://elpa.gnu.org/packages/debbugs-0.11.tar";
sha256 = "10v9s7ayvfzd6j6hqfc9zihxgmsc2j0xhxrgy3ah30qkqn6z8w6n";
};
packageRequires = [ cl-lib soap-client ];
meta = {
@ -711,10 +711,10 @@
}) {};
exwm = callPackage ({ elpaBuild, fetchurl, lib, xelb }: elpaBuild {
pname = "exwm";
version = "0.10";
version = "0.11";
src = fetchurl {
url = "https://elpa.gnu.org/packages/exwm-0.10.tar";
sha256 = "1c8558dxy7a2m61a0bc0p5vrdw3nw03zq9s8wxgmdvlklyzbqa22";
url = "https://elpa.gnu.org/packages/exwm-0.11.tar";
sha256 = "108n09b6512y05rskq754hzwc5nzqmkq1lfrarl34my41wsc1qnf";
};
packageRequires = [ xelb ];
meta = {
@ -767,10 +767,10 @@
ggtags = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "ggtags";
version = "0.8.11";
version = "0.8.12";
src = fetchurl {
url = "https://elpa.gnu.org/packages/ggtags-0.8.11.el";
sha256 = "1q2bp2b7lylf7n6c1psfn5swyjg0y78ykm0ak2kd84pbyhqak2mq";
url = "https://elpa.gnu.org/packages/ggtags-0.8.12.el";
sha256 = "0ny3llk021g6r0s75xdm4hzpbxv393ddm2r6f2xdk8kqnq4gnirp";
};
packageRequires = [ cl-lib emacs ];
meta = {
@ -1336,10 +1336,10 @@
}) {};
org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
pname = "org";
version = "20160912";
version = "20161003";
src = fetchurl {
url = "https://elpa.gnu.org/packages/org-20160912.tar";
sha256 = "0g44hcyk9x0103mfkmkbrn4f36vlyrfxil1qd3fpwardcnaxr5w4";
url = "https://elpa.gnu.org/packages/org-20161003.tar";
sha256 = "077v69l3w5q0rfbj1mm92cs2pz5yh3p89qnxxj0zn3g5m0dg9yjm";
};
packageRequires = [];
meta = {
@ -1687,10 +1687,10 @@
}) {};
stream = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild {
pname = "stream";
version = "2.2.2";
version = "2.2.3";
src = fetchurl {
url = "https://elpa.gnu.org/packages/stream-2.2.2.el";
sha256 = "00p24ipn8frlhhwzrz6za7dq4fkhs8i8cwp48yhsq9zpnj9y38xb";
url = "https://elpa.gnu.org/packages/stream-2.2.3.el";
sha256 = "1y9nh5473p0dd149g675nybsdnzp8c4mq3wdql066nir7scz6rhy";
};
packageRequires = [ emacs ];
meta = {
@ -2061,10 +2061,10 @@
ztree = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
elpaBuild {
pname = "ztree";
version = "1.0.3";
version = "1.0.4";
src = fetchurl {
url = "https://elpa.gnu.org/packages/ztree-1.0.3.tar";
sha256 = "1mwzk48sah4w5jmlmzqxnwhnlnc2mf25ayhgymv24sv8c6hdllsw";
url = "https://elpa.gnu.org/packages/ztree-1.0.4.tar";
sha256 = "0xiiaa660s8z7901siwvmqkqz30agfzsy3zcyry2r017m3ghqjph";
};
packageRequires = [ cl-lib ];
meta = {

File diff suppressed because it is too large Load diff

View file

@ -1,10 +1,10 @@
{ callPackage }: {
org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
pname = "org";
version = "20160912";
version = "20161003";
src = fetchurl {
url = "http://orgmode.org/elpa/org-20160912.tar";
sha256 = "1xawj0pdvqrgzlixxgbfa01gzajfaz47anr5m4aw035rhc6s02r7";
url = "http://orgmode.org/elpa/org-20161003.tar";
sha256 = "1q59s9ir9x8ig4nfx6vbq3dj3ah01sjwvqax2x2dqxn2mk2igr4x";
};
packageRequires = [];
meta = {
@ -14,10 +14,10 @@
}) {};
org-plus-contrib = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
pname = "org-plus-contrib";
version = "20160912";
version = "20161003";
src = fetchurl {
url = "http://orgmode.org/elpa/org-plus-contrib-20160912.tar";
sha256 = "15id0gz60hqbhr183vnz4winpisa2kwrh47zqz37a5yx5b8fc84r";
url = "http://orgmode.org/elpa/org-plus-contrib-20161003.tar";
sha256 = "0phi7jdkv7m4y7q7ilkz0dfw9g11d52dd34pv41dvawf032wvwn7";
};
packageRequires = [];
meta = {