3
0
Fork 0
forked from mirrors/nixpkgs

Merge pull request #87125 from collares/emacs2nix

emacs2nix: update to fix org elpa update script
This commit is contained in:
adisbladis 2020-05-06 21:27:36 +02:00 committed by GitHub
commit 6dc5d17632
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 9 deletions

View file

@ -4,8 +4,8 @@ let
src = pkgs.fetchgit {
url = "https://github.com/ttuegel/emacs2nix.git";
fetchSubmodules = true;
rev = "752fe1bd891425cb7a4a53cd7b98c194c1fe4518";
sha256 = "0asfdswh8sbnapbqhbz539zzxmv72f1iviha95iys34sgnd5k1nk";
rev = "d4c52a7b22b0622aecf0b0d59941a4a2b250617c";
sha256 = "133m0bmm8ahy0jbappgcdjqppkpxf5s9wg4gg254afx3f7yfqzbh";
};
in pkgs.mkShell {

View file

@ -4,10 +4,10 @@
elpaBuild {
pname = "org";
ename = "org";
version = "20191203";
version = "20200504";
src = fetchurl {
url = "https://orgmode.org/elpa/org-20191203.tar";
sha256 = "1fcgiswjnqmfzx3xkmlqyyhc4a8ms07vdsv7nkizgxqdh9hwfm2q";
url = "https://orgmode.org/elpa/org-20200504.tar";
sha256 = "1nalr2jafhzfkaf4bn8kscxd7nm1wz7dbw2629j2msxknw76dwk1";
};
packageRequires = [];
meta = {
@ -19,10 +19,10 @@
elpaBuild {
pname = "org-plus-contrib";
ename = "org-plus-contrib";
version = "20191203";
version = "20200504";
src = fetchurl {
url = "https://orgmode.org/elpa/org-plus-contrib-20191203.tar";
sha256 = "1kvw95492acb7gqn8gxbp1vg4fyw80w43yvflxnfxdf6jnnw2wah";
url = "https://orgmode.org/elpa/org-plus-contrib-20200504.tar";
sha256 = "1ykw3qspz18jgf3ngsvk2ys282489fcjrbk7pbv3ppxzjha4rmhb";
};
packageRequires = [];
meta = {
@ -30,4 +30,4 @@
license = lib.licenses.free;
};
}) {};
}
}