about summary refs log tree commit diff
path: root/pkgs/applications
diff options
context:
space:
mode:
authoradisbladis <adisbladis@gmail.com>2020-05-06 21:27:36 +0200
committerGitHub <noreply@github.com>2020-05-06 21:27:36 +0200
commit6dc5d17632956baf6c50898237633aa6529595d1 (patch)
tree60afa79c6458071176210ed1e4c805fde8c87c67 /pkgs/applications
parent1c2f01d8da8fc3a6d1963e9c8c1297250cd36fd0 (diff)
parent135ea5fe08171d04a89640662276811dc2144cf0 (diff)
downloadnixlib-6dc5d17632956baf6c50898237633aa6529595d1.tar
nixlib-6dc5d17632956baf6c50898237633aa6529595d1.tar.gz
nixlib-6dc5d17632956baf6c50898237633aa6529595d1.tar.bz2
nixlib-6dc5d17632956baf6c50898237633aa6529595d1.tar.lz
nixlib-6dc5d17632956baf6c50898237633aa6529595d1.tar.xz
nixlib-6dc5d17632956baf6c50898237633aa6529595d1.tar.zst
nixlib-6dc5d17632956baf6c50898237633aa6529595d1.zip
Merge pull request #87125 from collares/emacs2nix
emacs2nix: update to fix org elpa update script
Diffstat (limited to 'pkgs/applications')
-rw-r--r--pkgs/applications/editors/emacs-modes/emacs2nix.nix4
-rw-r--r--pkgs/applications/editors/emacs-modes/org-generated.nix14
2 files changed, 9 insertions, 9 deletions
diff --git a/pkgs/applications/editors/emacs-modes/emacs2nix.nix b/pkgs/applications/editors/emacs-modes/emacs2nix.nix
index cedc56e97ceb..852f395c4a22 100644
--- a/pkgs/applications/editors/emacs-modes/emacs2nix.nix
+++ b/pkgs/applications/editors/emacs-modes/emacs2nix.nix
@@ -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 {
diff --git a/pkgs/applications/editors/emacs-modes/org-generated.nix b/pkgs/applications/editors/emacs-modes/org-generated.nix
index 302f5adcfb1f..4ff1db1c7439 100644
--- a/pkgs/applications/editors/emacs-modes/org-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/org-generated.nix
@@ -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;
         };
       }) {};
-  }
+  }
\ No newline at end of file