Merge pull request #9426 from ebzzry/conkeror-update

conkeror: 20150319 -> 20150730

+3 -3
+3 -3
pkgs/applications/networking/browsers/conkeror/default.nix
··· 1 1 { stdenv, fetchgit, unzip, firefox, makeWrapper }: 2 2 3 3 stdenv.mkDerivation { 4 - name = "conkeror-1.0pre-20150319"; 4 + name = "conkeror-1.0pre-20150730"; 5 5 6 6 src = fetchgit { 7 7 url = git://repo.or.cz/conkeror.git; 8 - rev = "6450632b3f0c315f79e7a9856658083fe8fc9c29"; 9 - sha256 = "18cqz1n2n6aimmgd69mdrgmkjf4207k7yz11wihka6b5z1hfiv64"; 8 + rev = "a1f7e879b129df5cf14ea4ce80a9c1407380ed58"; 9 + sha256 = "12d8949a81a670037664dd930f7efe3d54b321aad48deea68343eba9aaea8785"; 10 10 }; 11 11 12 12 buildInputs = [ unzip makeWrapper ];