Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

v8: 3.26.8 -> 3.26.31.15

+10 -34
+10 -7
pkgs/development/libraries/v8/default.nix
··· 8 8 9 9 stdenv.mkDerivation rec { 10 10 name = "v8-${version}"; 11 - version = "3.26.8"; 11 + version = "3.26.31.15"; 12 12 13 13 src = fetchurl { 14 14 url = "https://commondatastorage.googleapis.com/chromium-browser-official/" 15 15 + "${name}.tar.bz2"; 16 - sha256 = "0w8mfy8jlqvp958c0zhsfwf0s3m6kw53jhcyg6aiwh877g6s21iz"; 16 + sha256 = "067pk6hr7wjx7yxhla5la0rnv51kf7837kfydzydjwapsbcx6m8l"; 17 17 }; 18 + 19 + patchPhase = '' 20 + sed -i 's,#!/usr/bin/env python,#!${python}/bin/python,' build/gyp_v8 21 + ''; 18 22 19 23 configurePhase = '' 20 24 PYTHONPATH="tools/generate_shim_headers:$PYTHONPATH" \ 21 - ${gyp}/bin/gyp \ 25 + PYTHONPATH="$(toPythonPath ${gyp}):$PYTHONPATH" \ 26 + build/gyp_v8 \ 22 27 -f make \ 23 28 --generator-output="out" \ 24 29 -Dflock_index=0 \ ··· 26 31 -Duse_system_icu=1 \ 27 32 -Dconsole=readline \ 28 33 -Dcomponent=shared_library \ 29 - -Dv8_target_arch=${arch} \ 30 - --depth=. -Ibuild/standalone.gypi \ 31 - build/all.gyp 34 + -Dv8_target_arch=${arch} 32 35 ''; 33 36 34 37 nativeBuildInputs = [ which ]; ··· 60 63 61 64 meta = with stdenv.lib; { 62 65 description = "Google's open source JavaScript engine"; 63 - platforms = platforms.linux ++ platforms.darwin; 66 + platforms = with platforms; linux ++ darwin; 64 67 license = licenses.bsd3; 65 68 }; 66 69 }
-27
pkgs/development/libraries/v8/fix-GetLocalizedMessage-usage.patch
··· 1 - From dbe142c4eda0f15fad9fa85743dd11b81292fa8f Mon Sep 17 00:00:00 2001 2 - From: Timothy J Fontaine <tjfontaine@gmail.com> 3 - Date: Thu, 23 May 2013 13:57:59 -0700 4 - Subject: [PATCH] v8: fix GetLocalizedMessage usage 5 - 6 - As is the backport of the abort on uncaught exception wouldn't compile 7 - because we it was passing in `this` when it was unnecessary. 8 - --- 9 - deps/v8/src/isolate.cc | 2 +- 10 - 1 file changed, 1 insertion(+), 1 deletion(-) 11 - 12 - diff --git a/src/isolate.cc b/src/isolate.cc 13 - index 04a438b..5a5293e 100644 14 - --- a/src/isolate.cc 15 - +++ b/src/isolate.cc 16 - @@ -1161,7 +1161,7 @@ void Isolate::DoThrow(Object* exception, MessageLocation* location) { 17 - (report_exception || can_be_caught_externally)) { 18 - fatal_exception_depth++; 19 - fprintf(stderr, "%s\n\nFROM\n", 20 - - *MessageHandler::GetLocalizedMessage(this, message_obj)); 21 - + *MessageHandler::GetLocalizedMessage(message_obj)); 22 - PrintCurrentStackTrace(stderr); 23 - OS::Abort(); 24 - } 25 - -- 26 - 1.8.1.6 27 -