From a2b718fc80c58caf525f1a867ed127f1cf7c0e1b Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Fri, 21 Aug 2015 08:58:36 +0300 Subject: [PATCH] Switch to the git version for now to get Gecko 40 compatibility --- pkgs/development/tools/slimerjs/default.nix | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/pkgs/development/tools/slimerjs/default.nix b/pkgs/development/tools/slimerjs/default.nix index a35816e2511..5fd7be063f5 100644 --- a/pkgs/development/tools/slimerjs/default.nix +++ b/pkgs/development/tools/slimerjs/default.nix @@ -3,11 +3,13 @@ let s = # Generated upstream information rec { baseName="slimerjs"; - version="0.9.6"; + version="0.9.6.2015.08.20"; name="${baseName}-${version}"; hash="0wry296iv63bmvm3qbkbgk42nbs80cbir0kv27v0ah5f6kvjc9cq"; - url="http://download.slimerjs.org/releases/0.9.6/slimerjs-0.9.6.zip"; - sha256="0wry296iv63bmvm3qbkbgk42nbs80cbir0kv27v0ah5f6kvjc9cq"; + #url="http://download.slimerjs.org/releases/0.9.6/slimerjs-0.9.6.zip"; + url = "https://github.com/laurentj/slimerjs.git"; + rev = "87e0ff1d666897754a914131d8f1744195ee4d7a"; + sha256="0ifgr8pi40id7vcv8ipc754bys22bhij0kkhd691285x19f52alc"; }; buildInputs = [ unzip zip @@ -16,12 +18,12 @@ in stdenv.mkDerivation { inherit (s) name version; inherit buildInputs; - src = fetchurl { - inherit (s) url sha256; - }; - #src = fetchgit { - # inherit (s) url sha256 rev; + #src = fetchurl { + # inherit (s) url sha256; #}; + src = fetchgit { + inherit (s) url sha256 rev; + }; preConfigure = '' test -d src && cd src test -f omni.ja || zip omni.ja -r */