From 16bd51fc0d7ddec1039ea7fe4a3f737f4b06b08b Mon Sep 17 00:00:00 2001 From: Proglodyte Date: Sat, 23 Jul 2016 03:41:14 -0400 Subject: [PATCH 1/3] v8: fix 4.5.107 build Similar to #14272, but fixes 4.5 build rather than generic. - Ignores errors due to strict-overflow warnings - Strips clang-only '-Wno-format-pedantic' flag out since this build uses gcc --- lib/maintainers.nix | 1 + pkgs/development/libraries/v8/4.5.nix | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 1684b02d888..3c367b7d30d 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -312,6 +312,7 @@ pmiddend = "Philipp Middendorf "; prikhi = "Pavan Rikhi "; profpatsch = "Profpatsch "; + proglodyte = "Proglodyte "; pshendry = "Paul Hendry "; psibi = "Sibi "; pSub = "Pascal Wittmann "; diff --git a/pkgs/development/libraries/v8/4.5.nix b/pkgs/development/libraries/v8/4.5.nix index 065b656147d..655ccf1ccf3 100644 --- a/pkgs/development/libraries/v8/4.5.nix +++ b/pkgs/development/libraries/v8/4.5.nix @@ -83,6 +83,7 @@ stdenv.mkDerivation rec { sed -i 's,#!/usr/bin/env python,#!${python}/bin/python,' build/gyp_v8 sed -i 's,/bin/echo,${coreutils}/bin/echo,' build/standalone.gypi sed -i '/CR_CLANG_REVISION/ d' build/standalone.gypi + sed -i 's/-Wno-format-pedantic//g' build/standalone.gypi ''; configurePhase = '' @@ -104,6 +105,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ which ]; buildInputs = [ readline python icu patchelf ]; + NIX_CFLAGS_COMPILE = "-Wno-error=strict-overflow"; + buildFlags = [ "LINK=g++" "-C out" @@ -135,7 +138,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Google's open source JavaScript engine"; - maintainers = with maintainers; [ cstrahan ]; + maintainers = with maintainers; [ cstrahan proglodyte ]; platforms = platforms.linux; license = licenses.bsd3; }; From 781ed961eb47f869220a412c78bc32a163b5b5a5 Mon Sep 17 00:00:00 2001 From: Proglodyte Date: Sat, 23 Jul 2016 13:17:13 -0400 Subject: [PATCH 2/3] v8: use 4.5.107 by default Default v8 was fixed at 3.30.33, so running nix-build nixpkgs -A v8 would give us version 3.30.33, whereas nix-env -i v8 would install version 4.5.107. Now, both commands build 4.5.107, and there is still an option to install version 3.30.33 --- pkgs/development/libraries/v8/3.30.33.nix | 6 + pkgs/development/libraries/v8/4.5.nix | 145 --------------------- pkgs/development/libraries/v8/default.nix | 149 +++++++++++++++++++++- pkgs/top-level/all-packages.nix | 6 +- 4 files changed, 153 insertions(+), 153 deletions(-) create mode 100644 pkgs/development/libraries/v8/3.30.33.nix delete mode 100644 pkgs/development/libraries/v8/4.5.nix diff --git a/pkgs/development/libraries/v8/3.30.33.nix b/pkgs/development/libraries/v8/3.30.33.nix new file mode 100644 index 00000000000..6ae5c896efa --- /dev/null +++ b/pkgs/development/libraries/v8/3.30.33.nix @@ -0,0 +1,6 @@ +{ callPackage, ... } @ args: + +callPackage ./generic.nix (args // { + version = "3.30.33.16"; + sha256 = "1azf1b36gqj4z5x0k9wq2dkp99zfyhwb0d6i2cl5fjm3k6js7l45"; +}) diff --git a/pkgs/development/libraries/v8/4.5.nix b/pkgs/development/libraries/v8/4.5.nix deleted file mode 100644 index 655ccf1ccf3..00000000000 --- a/pkgs/development/libraries/v8/4.5.nix +++ /dev/null @@ -1,145 +0,0 @@ -{ stdenv, lib, fetchgit, fetchFromGitHub, gyp, readline, python, which, icu -, patchelf, coreutils -, doCheck ? false -}: - -assert readline != null; - -let - arch = if stdenv.isArm - then if stdenv.is64bit - then"arm64" - else "arm" - else if stdenv.is64bit - then"x64" - else "ia32"; - git_url = "https://chromium.googlesource.com"; - clangFlag = if stdenv.isDarwin then "1" else "0"; - - deps = { - "build/gyp" = fetchgit { - url = "${git_url}/external/gyp.git"; - rev = "5122240c5e5c4d8da12c543d82b03d6089eb77c5"; - sha256 = "0mdrrhmfl4jrdmfrxmg7ywhdf9c7gv2x08fiq955fs9z8kvxqgdx"; - }; - "third_party/icu" = fetchgit { - url = "${git_url}/chromium/deps/icu.git"; - rev = "c81a1a3989c3b66fa323e9a6ee7418d7c08297af"; - sha256 = "0xrhig85vpw9hqjrhkxsr69m2xnig2bwmjhylzffrwz0783l7yhw"; - }; - "buildtools" = fetchgit { - url = "${git_url}/chromium/buildtools.git"; - rev = "ecc8e253abac3b6186a97573871a084f4c0ca3ae"; - sha256 = "1ccfnj3dp4i0z2bj09zy8aa4x749id6h058qa330li368417jwci"; - }; - "testing/gtest" = fetchgit { - url = "${git_url}/external/googletest.git"; - rev = "23574bf2333f834ff665f894c97bef8a5b33a0a9"; - sha256 = "1scyrk8d6xrsqma27q0wdrxqfa2n12k8mi9lfbsm5ivim9sr1d75"; - }; - "testing/gmock" = fetchgit { - url = "${git_url}/external/googlemock.git"; - rev = "29763965ab52f24565299976b936d1265cb6a271"; - sha256 = "0n2ajjac7myr5bgqk0x7j8281b4whkzgr1irv5nji9n3xz5i6gz4"; - }; - "tools/clang" = fetchgit { - url = "${git_url}/chromium/src/tools/clang.git"; - rev = "73ec8804ed395b0886d6edf82a9f33583f4a7902"; - sha256 = "0p2w4cgj3d4lqa8arss3j86lk0g8zhbbn5pzlcrhy5pl4xphjbk3"; - }; - }; - -in - -stdenv.mkDerivation rec { - name = "v8-${version}"; - version = "4.5.107"; - - inherit doCheck; - - src = fetchFromGitHub { - owner = "v8"; - repo = "v8"; - rev = version; - sha256 = "0wbzi4rhm4ygsm1k4x0vwfm42z3j8ww6wz7bcvd0m7mqzayn0bw4"; - }; - - postUnpack = '' - ${lib.concatStringsSep "\n" ( - lib.mapAttrsToList (n: v: '' - mkdir -p $sourceRoot/${n} - cp -r ${v}/* $sourceRoot/${n} - '') deps)} - ''; - - # Patches pulled from: - # https://github.com/cowboyd/libv8/tree/4.5/patches - patches = lib.optional (!doCheck) ./disable-building-tests.patch ++ [ - ./fPIC-for-static.patch - ./build-standalone-static-library.patch - ]; - - postPatch = '' - sed -i 's,#!/usr/bin/env python,#!${python}/bin/python,' build/gyp_v8 - sed -i 's,/bin/echo,${coreutils}/bin/echo,' build/standalone.gypi - sed -i '/CR_CLANG_REVISION/ d' build/standalone.gypi - sed -i 's/-Wno-format-pedantic//g' build/standalone.gypi - ''; - - configurePhase = '' - PYTHONPATH="tools/generate_shim_headers:$PYTHONPATH" \ - PYTHONPATH="$(toPythonPath ${gyp}):$PYTHONPATH" \ - build/gyp_v8 \ - -f make \ - --generator-output="out" \ - -Dflock_index=0 \ - -Dclang=${clangFlag} \ - -Dv8_enable_i18n_support=1 \ - -Duse_system_icu=1 \ - -Dcomponent=shared_library \ - -Dconsole=readline \ - -Dv8_target_arch=${arch} \ - -Dv8_use_external_startup_data=0 - ''; - - nativeBuildInputs = [ which ]; - buildInputs = [ readline python icu patchelf ]; - - NIX_CFLAGS_COMPILE = "-Wno-error=strict-overflow"; - - buildFlags = [ - "LINK=g++" - "-C out" - "builddir=$(CURDIR)/Release" - "BUILDTYPE=Release" - ]; - - enableParallelBuilding = true; - - # the `libv8_libplatform` target is _only_ built as a static library, - # and is expected to be statically linked in when needed. - # see the following link for further commentary: - # https://github.com/cowboyd/therubyracer/issues/391 - installPhase = '' - install -vD out/Release/d8 "$out/bin/d8" - install -vD out/Release/mksnapshot "$out/bin/mksnapshot" - ${if stdenv.isDarwin then '' - install -vD out/Release/lib.target/libv8.dylib "$out/lib/libv8.dylib" - install_name_tool -change /usr/local/lib/libv8.dylib $out/lib/libv8.dylib -change /usr/lib/libgcc_s.1.dylib ${stdenv.cc.cc.lib}/lib/libgcc_s.1.dylib $out/bin/d8 - install_name_tool -id $out/lib/libv8.dylib -change /usr/lib/libgcc_s.1.dylib ${stdenv.cc.cc.lib}/lib/libgcc_s.1.dylib $out/lib/libv8.dylib - '' else '' - install -vD out/Release/lib.target/libv8.so "$out/lib/libv8.so" - ''} - mkdir -p "$out/include" - cp -vr include/*.h "$out/include" - cp -vr include/libplatform "$out/include" - cp -v out/Release/*.a "$out/lib" - ''; - - meta = with lib; { - description = "Google's open source JavaScript engine"; - maintainers = with maintainers; [ cstrahan proglodyte ]; - platforms = platforms.linux; - license = licenses.bsd3; - }; -} diff --git a/pkgs/development/libraries/v8/default.nix b/pkgs/development/libraries/v8/default.nix index 6ae5c896efa..655ccf1ccf3 100644 --- a/pkgs/development/libraries/v8/default.nix +++ b/pkgs/development/libraries/v8/default.nix @@ -1,6 +1,145 @@ -{ callPackage, ... } @ args: +{ stdenv, lib, fetchgit, fetchFromGitHub, gyp, readline, python, which, icu +, patchelf, coreutils +, doCheck ? false +}: -callPackage ./generic.nix (args // { - version = "3.30.33.16"; - sha256 = "1azf1b36gqj4z5x0k9wq2dkp99zfyhwb0d6i2cl5fjm3k6js7l45"; -}) +assert readline != null; + +let + arch = if stdenv.isArm + then if stdenv.is64bit + then"arm64" + else "arm" + else if stdenv.is64bit + then"x64" + else "ia32"; + git_url = "https://chromium.googlesource.com"; + clangFlag = if stdenv.isDarwin then "1" else "0"; + + deps = { + "build/gyp" = fetchgit { + url = "${git_url}/external/gyp.git"; + rev = "5122240c5e5c4d8da12c543d82b03d6089eb77c5"; + sha256 = "0mdrrhmfl4jrdmfrxmg7ywhdf9c7gv2x08fiq955fs9z8kvxqgdx"; + }; + "third_party/icu" = fetchgit { + url = "${git_url}/chromium/deps/icu.git"; + rev = "c81a1a3989c3b66fa323e9a6ee7418d7c08297af"; + sha256 = "0xrhig85vpw9hqjrhkxsr69m2xnig2bwmjhylzffrwz0783l7yhw"; + }; + "buildtools" = fetchgit { + url = "${git_url}/chromium/buildtools.git"; + rev = "ecc8e253abac3b6186a97573871a084f4c0ca3ae"; + sha256 = "1ccfnj3dp4i0z2bj09zy8aa4x749id6h058qa330li368417jwci"; + }; + "testing/gtest" = fetchgit { + url = "${git_url}/external/googletest.git"; + rev = "23574bf2333f834ff665f894c97bef8a5b33a0a9"; + sha256 = "1scyrk8d6xrsqma27q0wdrxqfa2n12k8mi9lfbsm5ivim9sr1d75"; + }; + "testing/gmock" = fetchgit { + url = "${git_url}/external/googlemock.git"; + rev = "29763965ab52f24565299976b936d1265cb6a271"; + sha256 = "0n2ajjac7myr5bgqk0x7j8281b4whkzgr1irv5nji9n3xz5i6gz4"; + }; + "tools/clang" = fetchgit { + url = "${git_url}/chromium/src/tools/clang.git"; + rev = "73ec8804ed395b0886d6edf82a9f33583f4a7902"; + sha256 = "0p2w4cgj3d4lqa8arss3j86lk0g8zhbbn5pzlcrhy5pl4xphjbk3"; + }; + }; + +in + +stdenv.mkDerivation rec { + name = "v8-${version}"; + version = "4.5.107"; + + inherit doCheck; + + src = fetchFromGitHub { + owner = "v8"; + repo = "v8"; + rev = version; + sha256 = "0wbzi4rhm4ygsm1k4x0vwfm42z3j8ww6wz7bcvd0m7mqzayn0bw4"; + }; + + postUnpack = '' + ${lib.concatStringsSep "\n" ( + lib.mapAttrsToList (n: v: '' + mkdir -p $sourceRoot/${n} + cp -r ${v}/* $sourceRoot/${n} + '') deps)} + ''; + + # Patches pulled from: + # https://github.com/cowboyd/libv8/tree/4.5/patches + patches = lib.optional (!doCheck) ./disable-building-tests.patch ++ [ + ./fPIC-for-static.patch + ./build-standalone-static-library.patch + ]; + + postPatch = '' + sed -i 's,#!/usr/bin/env python,#!${python}/bin/python,' build/gyp_v8 + sed -i 's,/bin/echo,${coreutils}/bin/echo,' build/standalone.gypi + sed -i '/CR_CLANG_REVISION/ d' build/standalone.gypi + sed -i 's/-Wno-format-pedantic//g' build/standalone.gypi + ''; + + configurePhase = '' + PYTHONPATH="tools/generate_shim_headers:$PYTHONPATH" \ + PYTHONPATH="$(toPythonPath ${gyp}):$PYTHONPATH" \ + build/gyp_v8 \ + -f make \ + --generator-output="out" \ + -Dflock_index=0 \ + -Dclang=${clangFlag} \ + -Dv8_enable_i18n_support=1 \ + -Duse_system_icu=1 \ + -Dcomponent=shared_library \ + -Dconsole=readline \ + -Dv8_target_arch=${arch} \ + -Dv8_use_external_startup_data=0 + ''; + + nativeBuildInputs = [ which ]; + buildInputs = [ readline python icu patchelf ]; + + NIX_CFLAGS_COMPILE = "-Wno-error=strict-overflow"; + + buildFlags = [ + "LINK=g++" + "-C out" + "builddir=$(CURDIR)/Release" + "BUILDTYPE=Release" + ]; + + enableParallelBuilding = true; + + # the `libv8_libplatform` target is _only_ built as a static library, + # and is expected to be statically linked in when needed. + # see the following link for further commentary: + # https://github.com/cowboyd/therubyracer/issues/391 + installPhase = '' + install -vD out/Release/d8 "$out/bin/d8" + install -vD out/Release/mksnapshot "$out/bin/mksnapshot" + ${if stdenv.isDarwin then '' + install -vD out/Release/lib.target/libv8.dylib "$out/lib/libv8.dylib" + install_name_tool -change /usr/local/lib/libv8.dylib $out/lib/libv8.dylib -change /usr/lib/libgcc_s.1.dylib ${stdenv.cc.cc.lib}/lib/libgcc_s.1.dylib $out/bin/d8 + install_name_tool -id $out/lib/libv8.dylib -change /usr/lib/libgcc_s.1.dylib ${stdenv.cc.cc.lib}/lib/libgcc_s.1.dylib $out/lib/libv8.dylib + '' else '' + install -vD out/Release/lib.target/libv8.so "$out/lib/libv8.so" + ''} + mkdir -p "$out/include" + cp -vr include/*.h "$out/include" + cp -vr include/libplatform "$out/include" + cp -v out/Release/*.a "$out/lib" + ''; + + meta = with lib; { + description = "Google's open source JavaScript engine"; + maintainers = with maintainers; [ cstrahan proglodyte ]; + platforms = platforms.linux; + license = licenses.bsd3; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 11c15d81357..cdad4abe6ac 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6400,9 +6400,9 @@ in gob2 = callPackage ../development/tools/misc/gob2 { }; gocd-agent = callPackage ../development/tools/continuous-integration/gocd-agent { }; - + gocd-server = callPackage ../development/tools/continuous-integration/gocd-server { }; - + gotty = callPackage ../servers/gotty { }; gradleGen = callPackage ../development/tools/build-managers/gradle { }; @@ -9531,7 +9531,7 @@ in inherit (pythonPackages) gyp; }; - v8_4_5 = callPackage ../development/libraries/v8/4.5.nix { + v8_3_30_33 = callPackage ../development/libraries/v8/3.30.33.nix { inherit (pythonPackages) gyp; }; From 986f12ec8935cf48f15bc876d470e3607b2734d2 Mon Sep 17 00:00:00 2001 From: Proglodyte Date: Sat, 23 Jul 2016 19:03:24 -0400 Subject: [PATCH 3/3] v8: 4.5.107 -> 5.4.232 Upgraded to latest v8. Updated v8 version and deps, also created a new patch similar to what existed for v4.5 --- pkgs/development/libraries/v8/4.5.nix | 145 ++++++++++++++++++ pkgs/development/libraries/v8/default.nix | 101 ++++++++---- .../libraries/v8/libv8-5.4.232.patch | 97 ++++++++++++ pkgs/top-level/all-packages.nix | 4 + 4 files changed, 320 insertions(+), 27 deletions(-) create mode 100644 pkgs/development/libraries/v8/4.5.nix create mode 100644 pkgs/development/libraries/v8/libv8-5.4.232.patch diff --git a/pkgs/development/libraries/v8/4.5.nix b/pkgs/development/libraries/v8/4.5.nix new file mode 100644 index 00000000000..655ccf1ccf3 --- /dev/null +++ b/pkgs/development/libraries/v8/4.5.nix @@ -0,0 +1,145 @@ +{ stdenv, lib, fetchgit, fetchFromGitHub, gyp, readline, python, which, icu +, patchelf, coreutils +, doCheck ? false +}: + +assert readline != null; + +let + arch = if stdenv.isArm + then if stdenv.is64bit + then"arm64" + else "arm" + else if stdenv.is64bit + then"x64" + else "ia32"; + git_url = "https://chromium.googlesource.com"; + clangFlag = if stdenv.isDarwin then "1" else "0"; + + deps = { + "build/gyp" = fetchgit { + url = "${git_url}/external/gyp.git"; + rev = "5122240c5e5c4d8da12c543d82b03d6089eb77c5"; + sha256 = "0mdrrhmfl4jrdmfrxmg7ywhdf9c7gv2x08fiq955fs9z8kvxqgdx"; + }; + "third_party/icu" = fetchgit { + url = "${git_url}/chromium/deps/icu.git"; + rev = "c81a1a3989c3b66fa323e9a6ee7418d7c08297af"; + sha256 = "0xrhig85vpw9hqjrhkxsr69m2xnig2bwmjhylzffrwz0783l7yhw"; + }; + "buildtools" = fetchgit { + url = "${git_url}/chromium/buildtools.git"; + rev = "ecc8e253abac3b6186a97573871a084f4c0ca3ae"; + sha256 = "1ccfnj3dp4i0z2bj09zy8aa4x749id6h058qa330li368417jwci"; + }; + "testing/gtest" = fetchgit { + url = "${git_url}/external/googletest.git"; + rev = "23574bf2333f834ff665f894c97bef8a5b33a0a9"; + sha256 = "1scyrk8d6xrsqma27q0wdrxqfa2n12k8mi9lfbsm5ivim9sr1d75"; + }; + "testing/gmock" = fetchgit { + url = "${git_url}/external/googlemock.git"; + rev = "29763965ab52f24565299976b936d1265cb6a271"; + sha256 = "0n2ajjac7myr5bgqk0x7j8281b4whkzgr1irv5nji9n3xz5i6gz4"; + }; + "tools/clang" = fetchgit { + url = "${git_url}/chromium/src/tools/clang.git"; + rev = "73ec8804ed395b0886d6edf82a9f33583f4a7902"; + sha256 = "0p2w4cgj3d4lqa8arss3j86lk0g8zhbbn5pzlcrhy5pl4xphjbk3"; + }; + }; + +in + +stdenv.mkDerivation rec { + name = "v8-${version}"; + version = "4.5.107"; + + inherit doCheck; + + src = fetchFromGitHub { + owner = "v8"; + repo = "v8"; + rev = version; + sha256 = "0wbzi4rhm4ygsm1k4x0vwfm42z3j8ww6wz7bcvd0m7mqzayn0bw4"; + }; + + postUnpack = '' + ${lib.concatStringsSep "\n" ( + lib.mapAttrsToList (n: v: '' + mkdir -p $sourceRoot/${n} + cp -r ${v}/* $sourceRoot/${n} + '') deps)} + ''; + + # Patches pulled from: + # https://github.com/cowboyd/libv8/tree/4.5/patches + patches = lib.optional (!doCheck) ./disable-building-tests.patch ++ [ + ./fPIC-for-static.patch + ./build-standalone-static-library.patch + ]; + + postPatch = '' + sed -i 's,#!/usr/bin/env python,#!${python}/bin/python,' build/gyp_v8 + sed -i 's,/bin/echo,${coreutils}/bin/echo,' build/standalone.gypi + sed -i '/CR_CLANG_REVISION/ d' build/standalone.gypi + sed -i 's/-Wno-format-pedantic//g' build/standalone.gypi + ''; + + configurePhase = '' + PYTHONPATH="tools/generate_shim_headers:$PYTHONPATH" \ + PYTHONPATH="$(toPythonPath ${gyp}):$PYTHONPATH" \ + build/gyp_v8 \ + -f make \ + --generator-output="out" \ + -Dflock_index=0 \ + -Dclang=${clangFlag} \ + -Dv8_enable_i18n_support=1 \ + -Duse_system_icu=1 \ + -Dcomponent=shared_library \ + -Dconsole=readline \ + -Dv8_target_arch=${arch} \ + -Dv8_use_external_startup_data=0 + ''; + + nativeBuildInputs = [ which ]; + buildInputs = [ readline python icu patchelf ]; + + NIX_CFLAGS_COMPILE = "-Wno-error=strict-overflow"; + + buildFlags = [ + "LINK=g++" + "-C out" + "builddir=$(CURDIR)/Release" + "BUILDTYPE=Release" + ]; + + enableParallelBuilding = true; + + # the `libv8_libplatform` target is _only_ built as a static library, + # and is expected to be statically linked in when needed. + # see the following link for further commentary: + # https://github.com/cowboyd/therubyracer/issues/391 + installPhase = '' + install -vD out/Release/d8 "$out/bin/d8" + install -vD out/Release/mksnapshot "$out/bin/mksnapshot" + ${if stdenv.isDarwin then '' + install -vD out/Release/lib.target/libv8.dylib "$out/lib/libv8.dylib" + install_name_tool -change /usr/local/lib/libv8.dylib $out/lib/libv8.dylib -change /usr/lib/libgcc_s.1.dylib ${stdenv.cc.cc.lib}/lib/libgcc_s.1.dylib $out/bin/d8 + install_name_tool -id $out/lib/libv8.dylib -change /usr/lib/libgcc_s.1.dylib ${stdenv.cc.cc.lib}/lib/libgcc_s.1.dylib $out/lib/libv8.dylib + '' else '' + install -vD out/Release/lib.target/libv8.so "$out/lib/libv8.so" + ''} + mkdir -p "$out/include" + cp -vr include/*.h "$out/include" + cp -vr include/libplatform "$out/include" + cp -v out/Release/*.a "$out/lib" + ''; + + meta = with lib; { + description = "Google's open source JavaScript engine"; + maintainers = with maintainers; [ cstrahan proglodyte ]; + platforms = platforms.linux; + license = licenses.bsd3; + }; +} diff --git a/pkgs/development/libraries/v8/default.nix b/pkgs/development/libraries/v8/default.nix index 655ccf1ccf3..09e1c951240 100644 --- a/pkgs/development/libraries/v8/default.nix +++ b/pkgs/development/libraries/v8/default.nix @@ -17,35 +17,85 @@ let clangFlag = if stdenv.isDarwin then "1" else "0"; deps = { - "build/gyp" = fetchgit { + "build" = fetchgit { + url = "${git_url}/chromium/src/build.git"; + rev = "2c67d4d74b6b3673228fab191918500a582ef3b0"; + sha256 = "0jc7hci5yh792pw0ahjfxrk5xzllnlrv9llmwlgcgn2x8x6bn34q"; + }; + "tools/gyp" = fetchgit { url = "${git_url}/external/gyp.git"; - rev = "5122240c5e5c4d8da12c543d82b03d6089eb77c5"; - sha256 = "0mdrrhmfl4jrdmfrxmg7ywhdf9c7gv2x08fiq955fs9z8kvxqgdx"; + rev = "e7079f0e0e14108ab0dba58728ff219637458563"; + sha256 = "0yd1ds13z0r9d2sb67f9i1gjn1zgzwyfv96qqqp6pn5pcfbialg6"; }; "third_party/icu" = fetchgit { url = "${git_url}/chromium/deps/icu.git"; - rev = "c81a1a3989c3b66fa323e9a6ee7418d7c08297af"; - sha256 = "0xrhig85vpw9hqjrhkxsr69m2xnig2bwmjhylzffrwz0783l7yhw"; + rev = "b5ecbb29a26532f72ef482569b223d5a51fd50bf"; + sha256 = "0ld47wdnk8grcba221z67l3pnphv9zwifk4y44f5b946w3iwmpns"; }; "buildtools" = fetchgit { url = "${git_url}/chromium/buildtools.git"; - rev = "ecc8e253abac3b6186a97573871a084f4c0ca3ae"; - sha256 = "1ccfnj3dp4i0z2bj09zy8aa4x749id6h058qa330li368417jwci"; + rev = "60f7f9a8b421ebf9a46041dfa2ff11c0fe59c582"; + sha256 = "0i10bw7yhslklqwcx5krs3k05sicb73cpwd0mkaz96yxsvmkvjq0"; + }; + "base/trace_event/common" = fetchgit { + url = "${git_url}/chromium/src/base/trace_event/common.git"; + rev = "315bf1e2d45be7d53346c31cfcc37424a32c30c8"; + sha256 = "1pp2ygvp20j6g4868hrmiw0j704kdvsi9d9wx2gbk7w79rc36695"; + }; + "platform/inspector_protocol" = fetchgit { + url = "${git_url}/chromium/src/third_party/WebKit/Source/platform/inspector_protocol.git"; + rev = "f49542089820a34a9a6e33264e09b73779407512"; + sha256 = "1lwpass3p4rpp2kjmxxxpkqyv4lznxhf4i0yy7mmrd7jkpc7kn8k"; + }; + "tools/mb" = fetchgit { + url = "${git_url}/chromium/src/tools/mb.git"; + rev = "0c4dc43c454f26936ddf3074ab8e9a41e3dc03a3"; + sha256 = "0f96qphbmwn1pprv0a6xf68p01s1jzx2sz6pmadqbrs1dgh1xwnk"; + }; + "tools/swarming_client" = fetchgit { + url = "${git_url}/external/swarming.client.git"; + rev = "7f63a272f7d9785ce41b6d10bb3106c49a968e57"; + sha256 = "1pmb8bq4qifjf2dzz8c4jdwhlvwgrl9ycjaalcyh1sbh4lx3yvv2"; }; "testing/gtest" = fetchgit { - url = "${git_url}/external/googletest.git"; - rev = "23574bf2333f834ff665f894c97bef8a5b33a0a9"; - sha256 = "1scyrk8d6xrsqma27q0wdrxqfa2n12k8mi9lfbsm5ivim9sr1d75"; + url = "${git_url}/external/github.com/google/googletest.git"; + rev = "6f8a66431cb592dad629028a50b3dd418a408c87"; + sha256 = "0bdba2lr6pg15bla9600zg0r0vm4lnrx0wqz84p376wfdxra24vw"; }; "testing/gmock" = fetchgit { url = "${git_url}/external/googlemock.git"; - rev = "29763965ab52f24565299976b936d1265cb6a271"; - sha256 = "0n2ajjac7myr5bgqk0x7j8281b4whkzgr1irv5nji9n3xz5i6gz4"; + rev = "0421b6f358139f02e102c9c332ce19a33faf75be"; + sha256 = "1xiky4v98maxs8fg1avcd56y0alv3hw8qyrlpd899zgzbq2k10pp"; + }; + "test/benchmarks/data" = fetchgit { + url = "${git_url}/v8/deps/third_party/benchmarks.git"; + rev = "05d7188267b4560491ff9155c5ee13e207ecd65f"; + sha256 = "0ad2ay14bn67d61ks4dmzadfnhkj9bw28r4yjdjjyzck7qbnzchl"; + }; + "test/mozilla/data" = fetchgit { + url = "${git_url}/v8/deps/third_party/mozilla-tests.git"; + rev = "f6c578a10ea707b1a8ab0b88943fe5115ce2b9be"; + sha256 = "0rfdan76yfawqxbwwb35aa57b723j3z9fx5a2w16nls02yk2kqyn"; + }; + "test/simdjs/data" = fetchgit { + url = "${git_url}/external/github.com/tc39/ecmascript_simd.git"; + rev = "baf493985cb9ea7cdbd0d68704860a8156de9556"; + sha256 = "178r0k40a58c1187gfzqz2i6as34l8cliy1g1x870wyy0qcvlq2q"; + }; + "test/test262/data" = fetchgit { + url = "${git_url}/external/github.com/tc39/test262.git"; + rev = "88bc7fe7586f161201c5f14f55c9c489f82b1b67"; + sha256 = "0gc7fmaqrgwb6rl02jnrm3synpwzzg0dfqy3zm386r1qcisl93xs"; + }; + "test/test262/harness" = fetchgit { + url = "${git_url}/external/github.com/test262-utils/test262-harness-py.git"; + rev = "cbd968f54f7a95c6556d53ba852292a4c49d11d8"; + sha256 = "094c3600a4wh1m3fvvlivn290kik1pzzvwabq77lk8bh4jkkv7ki"; }; "tools/clang" = fetchgit { url = "${git_url}/chromium/src/tools/clang.git"; - rev = "73ec8804ed395b0886d6edf82a9f33583f4a7902"; - sha256 = "0p2w4cgj3d4lqa8arss3j86lk0g8zhbbn5pzlcrhy5pl4xphjbk3"; + rev = "496622ab4aaa5be7e5a9b80617013cb02f45dc87"; + sha256 = "1gkhk2bzpxwzkirzcqfixxpprbr8mn6rk00krm25daarm3smydmf"; }; }; @@ -53,7 +103,7 @@ in stdenv.mkDerivation rec { name = "v8-${version}"; - version = "4.5.107"; + version = "5.4.232"; inherit doCheck; @@ -61,7 +111,7 @@ stdenv.mkDerivation rec { owner = "v8"; repo = "v8"; rev = version; - sha256 = "0wbzi4rhm4ygsm1k4x0vwfm42z3j8ww6wz7bcvd0m7mqzayn0bw4"; + sha256 = "1nqxbkz75m8xrjih0sj3f3iqvif4192vxdaxzy8r787rihjwg9nx"; }; postUnpack = '' @@ -72,24 +122,21 @@ stdenv.mkDerivation rec { '') deps)} ''; - # Patches pulled from: - # https://github.com/cowboyd/libv8/tree/4.5/patches - patches = lib.optional (!doCheck) ./disable-building-tests.patch ++ [ - ./fPIC-for-static.patch - ./build-standalone-static-library.patch - ]; + # Patch based off of: + # https://github.com/cowboyd/libv8/tree/v5.1.281.67.0/patches + patches = lib.optional (!doCheck) ./libv8-5.4.232.patch; postPatch = '' - sed -i 's,#!/usr/bin/env python,#!${python}/bin/python,' build/gyp_v8 - sed -i 's,/bin/echo,${coreutils}/bin/echo,' build/standalone.gypi - sed -i '/CR_CLANG_REVISION/ d' build/standalone.gypi - sed -i 's/-Wno-format-pedantic//g' build/standalone.gypi + sed -i 's,#!/usr/bin/env python,#!${python}/bin/python,' gypfiles/gyp_v8 + sed -i 's,/bin/echo,${coreutils}/bin/echo,' gypfiles/standalone.gypi + sed -i '/CR_CLANG_REVISION/ d' gypfiles/standalone.gypi + sed -i 's/-Wno-format-pedantic//g' gypfiles/standalone.gypi ''; configurePhase = '' PYTHONPATH="tools/generate_shim_headers:$PYTHONPATH" \ PYTHONPATH="$(toPythonPath ${gyp}):$PYTHONPATH" \ - build/gyp_v8 \ + gypfiles/gyp_v8 \ -f make \ --generator-output="out" \ -Dflock_index=0 \ diff --git a/pkgs/development/libraries/v8/libv8-5.4.232.patch b/pkgs/development/libraries/v8/libv8-5.4.232.patch new file mode 100644 index 00000000000..16c227cfe38 --- /dev/null +++ b/pkgs/development/libraries/v8/libv8-5.4.232.patch @@ -0,0 +1,97 @@ +From c9f42d1314c6026efcfcc01824f4e2fdfd05ebcf Mon Sep 17 00:00:00 2001 +From: Ben Sklaroff +Date: Sat, 23 Jul 2016 18:16:55 -0400 +Subject: [PATCH] libv8-5.4.232 + +--- + Makefile | 5 +---- + gypfiles/all.gyp | 32 -------------------------------- + gypfiles/standalone.gypi | 5 ++++- + 3 files changed, 5 insertions(+), 37 deletions(-) + +diff --git a/Makefile b/Makefile +index 5ea5c58..d1b2d73 100644 +--- a/Makefile ++++ b/Makefile +@@ -261,11 +261,8 @@ GYPFILES = third_party/icu/icu.gypi third_party/icu/icu.gyp \ + gypfiles/shim_headers.gypi gypfiles/features.gypi \ + gypfiles/standalone.gypi \ + gypfiles/toolchain.gypi gypfiles/all.gyp gypfiles/mac/asan.gyp \ +- test/cctest/cctest.gyp test/fuzzer/fuzzer.gyp \ +- test/unittests/unittests.gyp src/v8.gyp \ +- tools/parser-shell.gyp testing/gmock.gyp testing/gtest.gyp \ + buildtools/third_party/libc++abi/libc++abi.gyp \ +- buildtools/third_party/libc++/libc++.gyp samples/samples.gyp \ ++ buildtools/third_party/libc++/libc++.gyp \ + src/third_party/vtune/v8vtune.gyp src/d8.gyp + + # If vtunejit=on, the v8vtune.gyp will be appended. +diff --git a/gypfiles/all.gyp b/gypfiles/all.gyp +index ff1bea4..96820a0 100644 +--- a/gypfiles/all.gyp ++++ b/gypfiles/all.gyp +@@ -16,38 +16,6 @@ + '../tools/parser-shell.gyp:parser-shell', + ], + }], +- # These items don't compile for Android on Mac. +- ['host_os!="mac" or OS!="android"', { +- 'dependencies': [ +- '../samples/samples.gyp:*', +- '../test/cctest/cctest.gyp:*', +- '../test/fuzzer/fuzzer.gyp:*', +- '../test/unittests/unittests.gyp:*', +- ], +- }], +- ['test_isolation_mode != "noop"', { +- 'dependencies': [ +- '../test/bot_default.gyp:*', +- '../test/benchmarks/benchmarks.gyp:*', +- '../test/default.gyp:*', +- '../test/ignition.gyp:*', +- '../test/intl/intl.gyp:*', +- '../test/message/message.gyp:*', +- '../test/mjsunit/mjsunit.gyp:*', +- '../test/mozilla/mozilla.gyp:*', +- '../test/optimize_for_size.gyp:*', +- '../test/perf.gyp:*', +- '../test/preparser/preparser.gyp:*', +- '../test/simdjs/simdjs.gyp:*', +- '../test/test262/test262.gyp:*', +- '../test/webkit/webkit.gyp:*', +- '../tools/check-static-initializers.gyp:*', +- '../tools/gcmole/run_gcmole.gyp:*', +- '../tools/jsfunfuzz/jsfunfuzz.gyp:*', +- '../tools/run-deopt-fuzzer.gyp:*', +- '../tools/run-valgrind.gyp:*', +- ], +- }], + ] + } + ] +diff --git a/gypfiles/standalone.gypi b/gypfiles/standalone.gypi +index 89f06a0..a43976d 100644 +--- a/gypfiles/standalone.gypi ++++ b/gypfiles/standalone.gypi +@@ -506,6 +506,9 @@ + }], # fastbuild!=0 + ], + 'target_conditions': [ ++ ['_type=="static_library"', { ++ 'standalone_static_library': 1, ++ }], + ['v8_code == 0', { + 'defines!': [ + 'DEBUG', +@@ -770,7 +773,7 @@ + [ 'visibility=="hidden" and v8_enable_backtrace==0', { + 'cflags': [ '-fvisibility=hidden' ], + }], +- [ 'component=="shared_library"', { ++ [ 'component=="shared_library" or component=="static_library" and (v8_target_arch=="x64" or v8_target_arch=="arm64" or v8_target_arch=="arm")', { + 'cflags': [ '-fPIC', ], + }], + [ 'clang==0 and coverage==1', { +-- +2.9.0 + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cdad4abe6ac..c1936d6766b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9535,6 +9535,10 @@ in inherit (pythonPackages) gyp; }; + v8_4_5 = callPackage ../development/libraries/v8/4.5.nix { + inherit (pythonPackages) gyp; + }; + v8 = callPackage ../development/libraries/v8 { inherit (pythonPackages) gyp; };