summary refs log tree commit diff
path: root/pkgs/applications
diff options
context:
space:
mode:
authorAustin Seipp <aseipp@pobox.com>2014-06-18 16:09:52 -0500
committerAustin Seipp <aseipp@pobox.com>2014-06-18 16:09:52 -0500
commitf72e9c109021968f37ac04473cebc289e7a6fd4a (patch)
treeedbece8a2d8e7fd9f085df44928e761037ca0660 /pkgs/applications
parentfb24267670de4dd62555c282c4ea1c5449f236aa (diff)
parent69492796ef3968e9c1787a96c36707b70a3034df (diff)
downloadnixlib-f72e9c109021968f37ac04473cebc289e7a6fd4a.tar
nixlib-f72e9c109021968f37ac04473cebc289e7a6fd4a.tar.gz
nixlib-f72e9c109021968f37ac04473cebc289e7a6fd4a.tar.bz2
nixlib-f72e9c109021968f37ac04473cebc289e7a6fd4a.tar.lz
nixlib-f72e9c109021968f37ac04473cebc289e7a6fd4a.tar.xz
nixlib-f72e9c109021968f37ac04473cebc289e7a6fd4a.tar.zst
nixlib-f72e9c109021968f37ac04473cebc289e7a6fd4a.zip
Merge pull request #2975 from bluescreen303/conkeror
conkeror: upgrade to latest snapshot
Diffstat (limited to 'pkgs/applications')
-rw-r--r--pkgs/applications/networking/browsers/conkeror/default.nix6
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/applications/networking/browsers/conkeror/default.nix b/pkgs/applications/networking/browsers/conkeror/default.nix
index cd96c0a6be88..47381f06d68d 100644
--- a/pkgs/applications/networking/browsers/conkeror/default.nix
+++ b/pkgs/applications/networking/browsers/conkeror/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchgit, unzip, xulrunner, makeWrapper }:
 
 stdenv.mkDerivation {
-  name = "conkeror-1.0pre-20140509";
+  name = "conkeror-1.0pre-20140616";
 
   src = fetchgit {
     url = git://repo.or.cz/conkeror.git;
-    rev = "eaf02dccf979d824667d177544103af000ae40bf";
-    sha256 = "1896db59d260f34a459402cb0c252b636aab9bf0378ae663a6d039f15af5b350";
+    rev = "8a26fff5896a3360549e2adfbf06b1d57e909266";
+    sha256 = "56f1c71ca1753a63d7599d3e8bf52277711b2693e7709ed7c146f34940441cb4";
   };
 
   buildInputs = [ unzip makeWrapper ];