diff options
author | Michael Raskin <7c6f434c@mail.ru> | 2013-10-31 02:59:45 +0400 |
---|---|---|
committer | Michael Raskin <7c6f434c@mail.ru> | 2013-10-31 02:59:45 +0400 |
commit | 92e3206c2ae8219415978dbf1bfc6d35604d17ae (patch) | |
tree | 521d1794e498310cb77d4840a56228dd25cb6d44 /pkgs/development/tools/slimerjs | |
parent | 6e062f14347169385688f686d46a4fa23631731a (diff) |
Updating SlimerJS to Git version for compatibility with fresh xulrunner
Diffstat (limited to 'pkgs/development/tools/slimerjs')
-rw-r--r-- | pkgs/development/tools/slimerjs/default.nix | 26 | ||||
-rw-r--r-- | pkgs/development/tools/slimerjs/default.upstream.git | 3 |
2 files changed, 20 insertions, 9 deletions
diff --git a/pkgs/development/tools/slimerjs/default.nix b/pkgs/development/tools/slimerjs/default.nix index ad60186804c26..0fe10a0003aba 100644 --- a/pkgs/development/tools/slimerjs/default.nix +++ b/pkgs/development/tools/slimerjs/default.nix @@ -1,28 +1,36 @@ -{stdenv, fetchurl, unzip, xulrunner, bash}: +{stdenv, fetchurl, fetchgit, zip, unzip, xulrunner, bash}: let s = # Generated upstream information rec { baseName="slimerjs"; - version="0.8.4"; + version="git-2013-10-31"; name="${baseName}-${version}"; - hash="12hv126i304y3lr8z420vpdlrks1qzz0zwfi5yishdfiasdl5pyd"; - url="http://download.slimerjs.org/v0.8/slimerjs-0.8.4.zip"; - sha256="12hv126i304y3lr8z420vpdlrks1qzz0zwfi5yishdfiasdl5pyd"; + hash="643a9d2f97f238bbd9debb17c010946d507a3b740079d9398939e7fdd70256b9"; + url="https://github.com/laurentj/slimerjs"; + rev="fdeb7364d3e29b47391ed0651176c1aedcb5277f"; + sha256="643a9d2f97f238bbd9debb17c010946d507a3b740079d9398939e7fdd70256b9"; }; buildInputs = [ - unzip + unzip zip ]; in stdenv.mkDerivation { inherit (s) name version; inherit buildInputs; - src = fetchurl { - inherit (s) url sha256; + # 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 */ + ''; installPhase = '' mkdir -p "$out"/{bin,share/doc/slimerjs,lib/slimerjs} cp LICENSE README* "$out/share/doc/slimerjs" - cp * "$out/lib/slimerjs" + cp -r * "$out/lib/slimerjs" echo '#!${bash}/bin/bash' >> "$out/bin/slimerjs" echo 'export SLIMERJSLAUNCHER=${xulrunner}/bin/xulrunner' >> "$out/bin/slimerjs" echo "'$out/lib/slimerjs/slimerjs' \"\$@\"" >> "$out/bin/slimerjs" diff --git a/pkgs/development/tools/slimerjs/default.upstream.git b/pkgs/development/tools/slimerjs/default.upstream.git new file mode 100644 index 0000000000000..3066d5de82932 --- /dev/null +++ b/pkgs/development/tools/slimerjs/default.upstream.git @@ -0,0 +1,3 @@ +url https://github.com/laurentj/slimerjs +target default.nix +GH_latest |