lol

Updating SlimerJS to Git version for compatibility with fresh xulrunner

+25 -11
+3 -1
pkgs/build-support/upstream-updater/update-walker-service-specific.sh
··· 10 10 11 11 GH_latest () { 12 12 prefetch_command_rel ../fetchgit/nix-prefetch-git 13 - rev "$(curl "$CURRENT_URL/commits" | grep /commit/ | head -n 1 | xargs basename )" 13 + revision "$("$(dirname "$0")/urls-from-page.sh" "$CURRENT_URL/commits" | grep /commit/ | head -n 1 | xargs basename )" 14 + version '.*' "git-$(date +%Y-%m-%d)" 15 + NEED_TO_CHOOSE_URL= 14 16 }
+2 -1
pkgs/build-support/upstream-updater/update-walker.sh
··· 120 120 } 121 121 } 122 122 123 - rev () { 123 + revision () { 124 124 CURRENT_REV="$1" 125 + echo "CURRENT_REV: $CURRENT_REV" 125 126 } 126 127 127 128 prefetch_command () {
+17 -9
pkgs/development/tools/slimerjs/default.nix
··· 1 - {stdenv, fetchurl, unzip, xulrunner, bash}: 1 + {stdenv, fetchurl, fetchgit, zip, unzip, xulrunner, bash}: 2 2 let 3 3 s = # Generated upstream information 4 4 rec { 5 5 baseName="slimerjs"; 6 - version="0.8.4"; 6 + version="git-2013-10-31"; 7 7 name="${baseName}-${version}"; 8 - hash="12hv126i304y3lr8z420vpdlrks1qzz0zwfi5yishdfiasdl5pyd"; 9 - url="http://download.slimerjs.org/v0.8/slimerjs-0.8.4.zip"; 10 - sha256="12hv126i304y3lr8z420vpdlrks1qzz0zwfi5yishdfiasdl5pyd"; 8 + hash="643a9d2f97f238bbd9debb17c010946d507a3b740079d9398939e7fdd70256b9"; 9 + url="https://github.com/laurentj/slimerjs"; 10 + rev="fdeb7364d3e29b47391ed0651176c1aedcb5277f"; 11 + sha256="643a9d2f97f238bbd9debb17c010946d507a3b740079d9398939e7fdd70256b9"; 11 12 }; 12 13 buildInputs = [ 13 - unzip 14 + unzip zip 14 15 ]; 15 16 in 16 17 stdenv.mkDerivation { 17 18 inherit (s) name version; 18 19 inherit buildInputs; 19 - src = fetchurl { 20 - inherit (s) url sha256; 20 + # src = fetchurl { 21 + # inherit (s) url sha256; 22 + # }; 23 + src = fetchgit { 24 + inherit (s) url sha256 rev; 21 25 }; 26 + preConfigure = '' 27 + test -d src && cd src 28 + test -f omni.ja || zip omni.ja -r */ 29 + ''; 22 30 installPhase = '' 23 31 mkdir -p "$out"/{bin,share/doc/slimerjs,lib/slimerjs} 24 32 cp LICENSE README* "$out/share/doc/slimerjs" 25 - cp * "$out/lib/slimerjs" 33 + cp -r * "$out/lib/slimerjs" 26 34 echo '#!${bash}/bin/bash' >> "$out/bin/slimerjs" 27 35 echo 'export SLIMERJSLAUNCHER=${xulrunner}/bin/xulrunner' >> "$out/bin/slimerjs" 28 36 echo "'$out/lib/slimerjs/slimerjs' \"\$@\"" >> "$out/bin/slimerjs"
+3
pkgs/development/tools/slimerjs/default.upstream.git
··· 1 + url https://github.com/laurentj/slimerjs 2 + target default.nix 3 + GH_latest