mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-30 00:50:17 +02:00
v8: 8.4.255 -> 9.7.106.18
* Fix update.sh; * Use specific gn revision; * Install icudtl.dat.
This commit is contained in:
parent
7d88543234
commit
b57ce73d98
|
@ -1,75 +1,85 @@
|
||||||
{ stdenv, lib, fetchgit, fetchFromGitHub
|
{ stdenv, lib, fetchgit, fetchFromGitHub
|
||||||
, gn, ninja, python, pythonPackages, glib, pkg-config, icu
|
, gn, ninja, python3, glib, pkg-config, icu
|
||||||
, xcbuild, darwin
|
, xcbuild, darwin
|
||||||
, fetchpatch
|
, fetchpatch
|
||||||
}:
|
}:
|
||||||
|
|
||||||
|
# Use update.sh to update all checksums.
|
||||||
|
|
||||||
let
|
let
|
||||||
|
version = "9.7.106.18";
|
||||||
|
v8Src = fetchgit {
|
||||||
|
url = "https://chromium.googlesource.com/v8/v8";
|
||||||
|
rev = version;
|
||||||
|
sha256 = "0cb3w733w1xn6zq9dsr43nx6llcg9hrmb2dkxairarj9c0igpzyh";
|
||||||
|
};
|
||||||
|
|
||||||
git_url = "https://chromium.googlesource.com";
|
git_url = "https://chromium.googlesource.com";
|
||||||
|
|
||||||
# This data is from the DEPS file in the root of a V8 checkout
|
# This data is from the DEPS file in the root of a V8 checkout.
|
||||||
deps = {
|
deps = {
|
||||||
"base/trace_event/common" = fetchgit {
|
"base/trace_event/common" = fetchgit {
|
||||||
url = "${git_url}/chromium/src/base/trace_event/common.git";
|
url = "${git_url}/chromium/src/base/trace_event/common.git";
|
||||||
rev = "dab187b372fc17e51f5b9fad8201813d0aed5129";
|
rev = "7f36dbc19d31e2aad895c60261ca8f726442bfbb";
|
||||||
sha256 = "0dmpj9hj4xv3xb0fl1kb9hm4bhpbs2s5csx3z8cgjd5vwvhdzig4";
|
sha256 = "01b2fhbxznqbakxv42ivrzg6w8l7i9yrd9nf72d6p5xx9dm993j4";
|
||||||
};
|
};
|
||||||
build = fetchgit {
|
"build" = fetchgit {
|
||||||
url = "${git_url}/chromium/src/build.git";
|
url = "${git_url}/chromium/src/build.git";
|
||||||
rev = "26e9d485d01d6e0eb9dadd21df767a63494c8fea";
|
rev = "cf325916d58a194a935c26a56fcf6b525d1e2bf4";
|
||||||
sha256 = "1jjvsgj0cs97d26i3ba531ic1f9gqan8x7z4aya8yl8jx02l342q";
|
sha256 = "1ix4h1cpx9bvgln8590xh7lllhsd9w1hd5k9l1gx5yxxrmywd3s4";
|
||||||
};
|
};
|
||||||
"third_party/googletest/src" = fetchgit {
|
"third_party/googletest/src" = fetchgit {
|
||||||
url = "${git_url}/external/github.com/google/googletest.git";
|
url = "${git_url}/external/github.com/google/googletest.git";
|
||||||
rev = "e3f0319d89f4cbf32993de595d984183b1a9fc57";
|
rev = "16f637fbf4ffc3f7a01fa4eceb7906634565242f";
|
||||||
sha256 = "18xz71l2xjrqsc0q317whgw4xi1i5db24zcj7v04f5g6r1hyf1a5";
|
sha256 = "11012k3c3mxzdwcw2iparr9lrckafpyhqzclsj26hmfbgbdi0rrh";
|
||||||
};
|
};
|
||||||
"third_party/icu" = fetchgit {
|
"third_party/icu" = fetchgit {
|
||||||
url = "${git_url}/chromium/deps/icu.git";
|
url = "${git_url}/chromium/deps/icu.git";
|
||||||
rev = "f2223961702f00a8833874b0560d615a2cc42738";
|
rev = "eedbaf76e49d28465d9119b10c30b82906e606ff";
|
||||||
sha256 = "0z5p53kbrjfkjn0i12dpk55cp8976j2zk7a4wk88423s2c5w87zl";
|
sha256 = "0mppvx7wf9zlqjsfaa1cf06brh1fjb6nmiib0lhbb9hd55mqjdjj";
|
||||||
};
|
|
||||||
"third_party/jinja2" = fetchgit {
|
|
||||||
url = "${git_url}/chromium/src/third_party/jinja2.git";
|
|
||||||
rev = "b41863e42637544c2941b574c7877d3e1f663e25";
|
|
||||||
sha256 = "1qgilclkav67m6cl2xq2kmzkswrkrb2axc2z8mw58fnch4j1jf1r";
|
|
||||||
};
|
|
||||||
"third_party/markupsafe" = fetchgit {
|
|
||||||
url = "${git_url}/chromium/src/third_party/markupsafe.git";
|
|
||||||
rev = "8f45f5cfa0009d2a70589bcda0349b8cb2b72783";
|
|
||||||
sha256 = "168ppjmicfdh4i1l0l25s86mdbrz9fgxmiq1rx33x79mph41scfz";
|
|
||||||
};
|
};
|
||||||
"third_party/zlib" = fetchgit {
|
"third_party/zlib" = fetchgit {
|
||||||
url = "${git_url}/chromium/src/third_party/zlib.git";
|
url = "${git_url}/chromium/src/third_party/zlib.git";
|
||||||
rev = "156be8c52f80cde343088b4a69a80579101b6e67";
|
rev = "6da1d53b97c89b07e47714d88cab61f1ce003c68";
|
||||||
sha256 = "0hxbkkzmlv714fjq2jlp5dd2jc339xyh6gkjx1sz3srwv33mlk92";
|
sha256 = "0v7ylmbwfwv6w6wp29qdf77kjjnfr2xzin08n0v1yvbhs01h5ppy";
|
||||||
|
};
|
||||||
|
"third_party/jinja2" = fetchgit {
|
||||||
|
url = "${git_url}/chromium/src/third_party/jinja2.git";
|
||||||
|
rev = "ee69aa00ee8536f61db6a451f3858745cf587de6";
|
||||||
|
sha256 = "1fsnd5h0gisfp8bdsfd81kk5v4mkqf8z368c7qlm1qcwc4ri4x7a";
|
||||||
|
};
|
||||||
|
"third_party/markupsafe" = fetchgit {
|
||||||
|
url = "${git_url}/chromium/src/third_party/markupsafe.git";
|
||||||
|
rev = "1b882ef6372b58bfd55a3285f37ed801be9137cd";
|
||||||
|
sha256 = "1jnjidbh03lhfaawimkjxbprmsgz4snr0jl06630dyd41zkdw5kr";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
# See `gn_version` in DEPS.
|
||||||
|
gnSrc = fetchgit {
|
||||||
|
url = "https://gn.googlesource.com/gn";
|
||||||
|
rev = "8926696a4186279489cc2b8d768533e61bba73d7";
|
||||||
|
sha256 = "1084lnyb0a1khbgjvak05fcx6jy973wqvsf77n0alxjys18sg2yk";
|
||||||
|
};
|
||||||
|
|
||||||
|
myGn = gn.overrideAttrs (oldAttrs: {
|
||||||
|
version = "for-v8";
|
||||||
|
src = gnSrc;
|
||||||
|
});
|
||||||
|
|
||||||
in
|
in
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "v8";
|
pname = "v8";
|
||||||
version = "8.4.255";
|
inherit version;
|
||||||
|
|
||||||
doCheck = true;
|
doCheck = true;
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
# Remove unrecognized clang debug flags
|
|
||||||
(fetchpatch {
|
|
||||||
url = "https://raw.githubusercontent.com/saiarcot895/chromium-ubuntu-build/663dbfc492fd2f8ba28d9af40fb3b1327e6aa56e/debian/patches/revert-Xclang-instcombine-lower-dbg-declare.patch";
|
|
||||||
sha256 = "07qp4bjgbwbdrzqslvl2bgbzr3v97b9isbp0539x3lc8cy3h02g1";
|
|
||||||
})
|
|
||||||
./darwin.patch
|
./darwin.patch
|
||||||
./gcc_arm.patch # Fix building zlib with gcc on aarch64, from https://gist.github.com/Adenilson/d973b6fd96c7709d33ddf08cf1dcb149
|
|
||||||
];
|
];
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = v8Src;
|
||||||
owner = "v8";
|
|
||||||
repo = "v8";
|
|
||||||
rev = version;
|
|
||||||
sha256 = "07ymw4kqbz7kv311gpk5bs5q90wj73n2q7jkyfhqk4hvhs1q5bw7";
|
|
||||||
};
|
|
||||||
|
|
||||||
postUnpack = ''
|
postUnpack = ''
|
||||||
${lib.concatStringsSep "\n" (
|
${lib.concatStringsSep "\n" (
|
||||||
|
@ -80,16 +90,20 @@ stdenv.mkDerivation rec {
|
||||||
chmod u+w -R .
|
chmod u+w -R .
|
||||||
'';
|
'';
|
||||||
|
|
||||||
postPatch = lib.optionalString stdenv.isAarch64 ''
|
postPatch = ''
|
||||||
|
${lib.optionalString stdenv.isAarch64 ''
|
||||||
substituteInPlace build/toolchain/linux/BUILD.gn \
|
substituteInPlace build/toolchain/linux/BUILD.gn \
|
||||||
--replace 'toolprefix = "aarch64-linux-gnu-"' 'toolprefix = ""'
|
--replace 'toolprefix = "aarch64-linux-gnu-"' 'toolprefix = ""'
|
||||||
'' + lib.optionalString stdenv.isDarwin ''
|
''}
|
||||||
|
${lib.optionalString stdenv.isDarwin ''
|
||||||
substituteInPlace build/config/compiler/compiler.gni \
|
substituteInPlace build/config/compiler/compiler.gni \
|
||||||
--replace 'strip_absolute_paths_from_debug_symbols = true' \
|
--replace 'strip_absolute_paths_from_debug_symbols = true' \
|
||||||
'strip_absolute_paths_from_debug_symbols = false'
|
'strip_absolute_paths_from_debug_symbols = false'
|
||||||
substituteInPlace build/config/compiler/BUILD.gn \
|
substituteInPlace build/config/compiler/BUILD.gn \
|
||||||
--replace 'current_toolchain == host_toolchain || !use_xcode_clang' \
|
--replace 'current_toolchain == host_toolchain || !use_xcode_clang' \
|
||||||
'false'
|
'false'
|
||||||
|
''}
|
||||||
|
touch build/config/gclient_args.gni
|
||||||
'';
|
'';
|
||||||
|
|
||||||
gnFlags = [
|
gnFlags = [
|
||||||
|
@ -106,7 +120,6 @@ stdenv.mkDerivation rec {
|
||||||
"treat_warnings_as_errors=false"
|
"treat_warnings_as_errors=false"
|
||||||
"v8_enable_i18n_support=true"
|
"v8_enable_i18n_support=true"
|
||||||
"use_gold=false"
|
"use_gold=false"
|
||||||
"init_stack_vars=false"
|
|
||||||
# ''custom_toolchain="//build/toolchain/linux/unbundle:default"''
|
# ''custom_toolchain="//build/toolchain/linux/unbundle:default"''
|
||||||
''host_toolchain="//build/toolchain/linux/unbundle:default"''
|
''host_toolchain="//build/toolchain/linux/unbundle:default"''
|
||||||
''v8_snapshot_toolchain="//build/toolchain/linux/unbundle:default"''
|
''v8_snapshot_toolchain="//build/toolchain/linux/unbundle:default"''
|
||||||
|
@ -116,14 +129,14 @@ stdenv.mkDerivation rec {
|
||||||
FORCE_MAC_SDK_MIN = stdenv.targetPlatform.sdkVer or "10.12";
|
FORCE_MAC_SDK_MIN = stdenv.targetPlatform.sdkVer or "10.12";
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
gn
|
myGn
|
||||||
ninja
|
ninja
|
||||||
pkg-config
|
pkg-config
|
||||||
python
|
python3
|
||||||
] ++ lib.optionals stdenv.isDarwin [
|
] ++ lib.optionals stdenv.isDarwin [
|
||||||
xcbuild
|
xcbuild
|
||||||
darwin.DarwinTools
|
darwin.DarwinTools
|
||||||
pythonPackages.setuptools
|
python3.pkgs.setuptools
|
||||||
];
|
];
|
||||||
buildInputs = [ glib icu ];
|
buildInputs = [ glib icu ];
|
||||||
|
|
||||||
|
@ -133,7 +146,8 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
install -D d8 $out/bin/d8
|
install -D d8 $out/bin/d8
|
||||||
install -D obj/libv8_monolith.a $out/lib/libv8.a
|
install -D -m644 obj/libv8_monolith.a $out/lib/libv8.a
|
||||||
|
install -D -m644 icudtl.dat $out/share/v8/icudtl.dat
|
||||||
cp -r ../../include $out
|
cp -r ../../include $out
|
||||||
|
|
||||||
mkdir -p $out/lib/pkgconfig
|
mkdir -p $out/lib/pkgconfig
|
||||||
|
|
|
@ -1,31 +0,0 @@
|
||||||
diff --git a/third_party/zlib/contrib/optimizations/insert_string.h b/third_party/zlib/contrib/optimizations/insert_string.h
|
|
||||||
index 1826601..d123305 100644
|
|
||||||
--- a/third_party/zlib/contrib/optimizations/insert_string.h
|
|
||||||
+++ b/third_party/zlib/contrib/optimizations/insert_string.h
|
|
||||||
@@ -26,15 +26,23 @@
|
|
||||||
#define _cpu_crc32_u32 _mm_crc32_u32
|
|
||||||
|
|
||||||
#elif defined(CRC32_ARMV8_CRC32)
|
|
||||||
- #if defined(__clang__)
|
|
||||||
+ #if defined(__GNUC__) || defined(__clang__)
|
|
||||||
#undef TARGET_CPU_WITH_CRC
|
|
||||||
- #define __crc32cw __builtin_arm_crc32cw
|
|
||||||
+ #if defined(__clang__)
|
|
||||||
+ #define __crc32cw __builtin_arm_crc32cw
|
|
||||||
+ #elif defined(__GNUC__)
|
|
||||||
+ #define __crc32cw __builtin_aarch64_crc32cw
|
|
||||||
+ #endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#define _cpu_crc32_u32 __crc32cw
|
|
||||||
|
|
||||||
#if defined(__aarch64__)
|
|
||||||
- #define TARGET_CPU_WITH_CRC __attribute__((target("crc")))
|
|
||||||
+ #if defined(__clang__)
|
|
||||||
+ #define TARGET_CPU_WITH_CRC __attribute__((target("crc")))
|
|
||||||
+ #elif defined(__GNUC__)
|
|
||||||
+ #define TARGET_CPU_WITH_CRC __attribute__((target("+crc")))
|
|
||||||
+ #endif
|
|
||||||
#else // !defined(__aarch64__)
|
|
||||||
#define TARGET_CPU_WITH_CRC __attribute__((target("armv8-a,crc")))
|
|
||||||
#endif // defined(__aarch64__)
|
|
|
@ -1,29 +1,45 @@
|
||||||
#!/usr/bin/env nix-shell
|
#!/usr/bin/env nix-shell
|
||||||
#! nix-shell -i bash -p curl -p nix-prefetch-git
|
#! nix-shell -i bash -p curl -p nix-prefetch-git -p jq
|
||||||
VERSION_OVERVIEW=https://omahaproxy.appspot.com/all?os=linux
|
VERSION_OVERVIEW=https://omahaproxy.appspot.com/all?os=linux
|
||||||
TARGET_CHANNEL=beta
|
TARGET_CHANNEL=stable
|
||||||
FILE_PATH=6_x.nix
|
|
||||||
|
|
||||||
set -eo pipefail
|
set -eo pipefail
|
||||||
|
|
||||||
|
if [ -n "$1" ]; then
|
||||||
|
v8_version="$1"
|
||||||
|
shift
|
||||||
|
else
|
||||||
v8_version=$(curl -s "$VERSION_OVERVIEW" | awk -F "," "\$2 ~ /${TARGET_CHANNEL}/ { print \$11 }")
|
v8_version=$(curl -s "$VERSION_OVERVIEW" | awk -F "," "\$2 ~ /${TARGET_CHANNEL}/ { print \$11 }")
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ -n "$1" ]; then
|
||||||
|
file_path="$1"
|
||||||
|
else
|
||||||
|
file_path=default.nix
|
||||||
|
fi
|
||||||
|
|
||||||
echo "Using V8 version --> $v8_version"
|
echo "Using V8 version --> $v8_version"
|
||||||
sed -e "s#\\(version = \\)\"[0-9\.]*\"#\1\"$v8_version\"#" -i ${FILE_PATH}
|
|
||||||
|
|
||||||
sha256=$(nix-prefetch-git --no-deepClone https://github.com/v8/v8.git "refs/tags/${v8_version}" \
|
prefetched=$(nix-prefetch-git --no-deepClone https://chromium.googlesource.com/v8/v8 "refs/tags/${v8_version}")
|
||||||
| sed -ne '/sha256/ { s#.*: "\(.*\)".*#\1#; p }')
|
|
||||||
sed -e "/repo = \"v8\"/ { n;n; s#\".*\"#\"${sha256}\"# }" -i ${FILE_PATH}
|
|
||||||
|
|
||||||
deps="$(mktemp)"
|
path=$(echo "$prefetched" | jq -r .path)
|
||||||
|
sha256=$(echo "$prefetched" | jq -r .sha256)
|
||||||
|
sed -e "s#\\(version = \\)\"[0-9\.]*\"#\1\"$v8_version\"#" -i ${file_path}
|
||||||
|
sed -e "/v8Src = fetchgit/ { n; n; n; s/\".*\"/\"${sha256}\"/ }" -i ${file_path}
|
||||||
|
|
||||||
curl -s -o "$deps" "https://raw.githubusercontent.com/v8/v8/${v8_version}/DEPS"
|
deps="$path/DEPS"
|
||||||
echo $deps
|
|
||||||
|
|
||||||
sed -ne '/= fetchgit {/ { s/.*"\(.*\)".*/\1/; p }' < ${FILE_PATH} | while read dep; do
|
echo "$deps"
|
||||||
|
|
||||||
|
echo "Processing gn"
|
||||||
|
gn_rev=$(sed -ne "s/.*'gn_version': 'git_revision:\([^']*\).*/\1/p" < "$deps")
|
||||||
|
gn_sha256=$(nix-prefetch-git --no-deepClone https://gn.googlesource.com/gn "$gn_rev" 2>/dev/null | jq -r .sha256)
|
||||||
|
sed -e "/gnSrc = fetchgit/ { n; n; s/\".*\"/\"${gn_rev}\"/; n; s/\".*\"/\"${gn_sha256}\"/ }" -i ${file_path}
|
||||||
|
|
||||||
|
sed -ne '/" = fetchgit {/ { s/.*"\(.*\)".*/\1/; p }' < ${file_path} | while read dep; do
|
||||||
echo "Processing dependency --> $dep"
|
echo "Processing dependency --> $dep"
|
||||||
escaped_dep=$(echo "$dep" | sed -e 's#/#\\/#g')
|
escaped_dep=$(echo "$dep" | sed -e 's#/#\\/#g')
|
||||||
dep_rev=$(sed -ne "/\"v8\/${escaped_dep}\":/ { n; s#.*+ \"##; s#\".*##; p }" "$deps")
|
dep_rev=$(sed -ne "/'${escaped_dep}':/ { n; s#.*+ '##; s#'.*##; p }" "$deps")
|
||||||
|
|
||||||
if [ "$dep_rev" = "" ]; then
|
if [ "$dep_rev" = "" ]; then
|
||||||
echo "Failed to resolve dependency $dep, not listed in DEPS file"
|
echo "Failed to resolve dependency $dep, not listed in DEPS file"
|
||||||
|
@ -31,8 +47,8 @@ sed -ne '/= fetchgit {/ { s/.*"\(.*\)".*/\1/; p }' < ${FILE_PATH} | while read d
|
||||||
exit 2
|
exit 2
|
||||||
fi
|
fi
|
||||||
|
|
||||||
repo_url=$(sed -ne "/\"${escaped_dep}\" = fetchgit/ { n; s/.*\"\(.*\)\".*/\1/; s#\${git_url}#https://chromium.googlesource.com#; p }" ${FILE_PATH})
|
repo_url=$(sed -ne "/\"${escaped_dep}\" = fetchgit/ { n; s/.*\"\(.*\)\".*/\1/; s#\${git_url}#https://chromium.googlesource.com#; p }" ${file_path})
|
||||||
sha256=$(nix-prefetch-git --no-deepClone "$repo_url" "$dep_rev" 2>/dev/null | sed -ne '/sha256/ { s#.*: "\(.*\)".*#\1#; p }')
|
sha256=$(nix-prefetch-git --no-deepClone "$repo_url" "$dep_rev" 2>/dev/null | jq -r .sha256)
|
||||||
|
|
||||||
if [ "$sha256" = "" ]; then
|
if [ "$sha256" = "" ]; then
|
||||||
echo "Failed to get sha256 via nix-prefetch-git $repo_url $dep_rev"
|
echo "Failed to get sha256 via nix-prefetch-git $repo_url $dep_rev"
|
||||||
|
@ -40,8 +56,7 @@ sed -ne '/= fetchgit {/ { s/.*"\(.*\)".*/\1/; p }' < ${FILE_PATH} | while read d
|
||||||
exit 2
|
exit 2
|
||||||
fi
|
fi
|
||||||
|
|
||||||
sed -e "/\"${escaped_dep}\" = fetchgit/ { n; n; s/\".*\"/\"${dep_rev}\"/; n; s/\".*\"/\"${sha256}\"/ }" -i ${FILE_PATH}
|
sed -e "/\"${escaped_dep}\" = fetchgit/ { n; n; s/\".*\"/\"${dep_rev}\"/; n; s/\".*\"/\"${sha256}\"/ }" -i ${file_path}
|
||||||
done
|
done
|
||||||
|
|
||||||
rm -f "$deps"
|
|
||||||
echo done.
|
echo done.
|
||||||
|
|
|
@ -20194,9 +20194,7 @@ with pkgs;
|
||||||
stdenv = gcc6Stdenv;
|
stdenv = gcc6Stdenv;
|
||||||
});
|
});
|
||||||
|
|
||||||
v8 = callPackage ../development/libraries/v8 {
|
v8 = callPackage ../development/libraries/v8 { };
|
||||||
inherit (python2Packages) python;
|
|
||||||
};
|
|
||||||
|
|
||||||
vaapiIntel = callPackage ../development/libraries/vaapi-intel { };
|
vaapiIntel = callPackage ../development/libraries/vaapi-intel { };
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue