summary refs log tree commit diff
path: root/pkgs/applications/editors/emacs-modes
diff options
context:
space:
mode:
authorPeter Simons <simons@cryp.to>2014-08-08 09:51:01 +0200
committerPeter Simons <simons@cryp.to>2014-08-08 09:51:01 +0200
commit9226fbf56a28bcc43ceb73773e12fa1e5c3edaa2 (patch)
treee61a7de75f426c942f91da2b0828149631d92957 /pkgs/applications/editors/emacs-modes
parent5c276c4f68125e7d53e0467a3e74969dbd05b51b (diff)
parentbdf5f45356afd6f4289e5e1f497a48c3dc54b38c (diff)
downloadnixpkgs-9226fbf56a28bcc43ceb73773e12fa1e5c3edaa2.tar
nixpkgs-9226fbf56a28bcc43ceb73773e12fa1e5c3edaa2.tar.gz
nixpkgs-9226fbf56a28bcc43ceb73773e12fa1e5c3edaa2.tar.bz2
nixpkgs-9226fbf56a28bcc43ceb73773e12fa1e5c3edaa2.tar.lz
nixpkgs-9226fbf56a28bcc43ceb73773e12fa1e5c3edaa2.tar.xz
nixpkgs-9226fbf56a28bcc43ceb73773e12fa1e5c3edaa2.tar.zst
nixpkgs-9226fbf56a28bcc43ceb73773e12fa1e5c3edaa2.zip
Merge remote-tracking branch 'origin/master' into staging.
Diffstat (limited to 'pkgs/applications/editors/emacs-modes')
-rw-r--r--pkgs/applications/editors/emacs-modes/js2/default.nix5
1 files changed, 2 insertions, 3 deletions
diff --git a/pkgs/applications/editors/emacs-modes/js2/default.nix b/pkgs/applications/editors/emacs-modes/js2/default.nix
index cbd88330434..47e62a281fb 100644
--- a/pkgs/applications/editors/emacs-modes/js2/default.nix
+++ b/pkgs/applications/editors/emacs-modes/js2/default.nix
@@ -1,12 +1,11 @@
 { stdenv, fetchgit, emacs }:
 
 stdenv.mkDerivation {
-  name = "js2-mode-0-20120712";
+  name = "js2-mode-0-20140114";
 
   src = fetchgit {
     url = "git://github.com/mooz/js2-mode.git";
-    rev = "f8cb9c52614e0a8e477f1ac557585ed950246c9b";
-    sha256 = "37055b7e8c1d9eee6b86f6b9b9d74ad196cc43701bc2263ffd539a3e44025047";
+    sha256 = "dbdc07b864a9506a21af445c7fb1c75fbffadaac980ee7bbf752470d8054bd65";
   };
 
   buildInputs = [ emacs ];