tjh.dev
Merge pull request #46113 from taktoa/taktoa/v8-6.9
v8_6_x: 6.2.414.27 -> 6.9.427.14
authored by
Matthew Bauer
and committed by
GitHub
514bfd7b
52ed0526
+73
-51
pkgs/development/libraries/v8/6_x.nix
+73
-51
pkgs/development/libraries/v8/6_x.nix
···
13
13
else "ia32";
14
14
git_url = "https://chromium.googlesource.com";
15
15
16
+
# This data is from the DEPS file in the root of a V8 checkout
16
17
deps = {
17
18
"base/trace_event/common" = fetchgit {
18
-
url = "${git_url}/chromium/src/base/trace_event/common.git";
19
-
rev = "65d1d42a5df6c0a563a6fdfa58a135679185e5d9";
20
-
sha256 = "0ikk0dj12adzr0138jrmwzhx8n9sl5qzs86a3mc3gva08a8wc84p";
19
+
url = "${git_url}/chromium/src/base/trace_event/common.git";
20
+
rev = "211b3ed9d0481b4caddbee1322321b86a483ca1f";
21
+
sha256 = "080sya1dg32hi5gj7zr3r5l18r6w8g0imajyf3xfvnz67a2i8dd7";
21
22
};
22
23
"build" = fetchgit {
23
-
url = "${git_url}/chromium/src/build.git";
24
-
rev = "48a2b7b39debc7c77c868c9ddb0a360af1ebc367";
25
-
sha256 = "0aj554dfdbwnikwaapznfq55wkwbvg4114h7qamixy8ryjkaiy0k";
24
+
url = "${git_url}/chromium/src/build.git";
25
+
rev = "7315579e388589b62236ad933f09afd1e838d234";
26
+
sha256 = "14gsigyjfm03kfzmz0v6429b6qnycvzx0yj3vwaks8may26aiv71";
26
27
};
27
28
"buildtools" = fetchgit {
28
-
url = "${git_url}/chromium/buildtools.git";
29
-
rev = "5af0a3a8b89827a8634132080a39ab4b63dee489";
30
-
sha256 = "1841803m40w1hmnmm7qzdpk4b6q1m8cb7q4hsflqfpddpf4lp3v1";
29
+
url = "${git_url}/chromium/buildtools.git";
30
+
rev = "0dd5c6f980d22be96b728155249df2da355989d9";
31
+
sha256 = "0m1fh0qjcx9c69khnqcsqvrnqs7ji6wfxns9vv9mknj20sph5ydr";
31
32
};
32
33
"test/benchmarks/data" = fetchgit {
33
-
url = "${git_url}/v8/deps/third_party/benchmarks.git";
34
-
rev = "05d7188267b4560491ff9155c5ee13e207ecd65f";
34
+
url = "${git_url}/v8/deps/third_party/benchmarks.git";
35
+
rev = "05d7188267b4560491ff9155c5ee13e207ecd65f";
35
36
sha256 = "0ad2ay14bn67d61ks4dmzadfnhkj9bw28r4yjdjjyzck7qbnzchl";
36
37
};
37
38
"test/mozilla/data" = fetchgit {
38
-
url = "${git_url}/v8/deps/third_party/mozilla-tests.git";
39
-
rev = "f6c578a10ea707b1a8ab0b88943fe5115ce2b9be";
39
+
url = "${git_url}/v8/deps/third_party/mozilla-tests.git";
40
+
rev = "f6c578a10ea707b1a8ab0b88943fe5115ce2b9be";
40
41
sha256 = "0rfdan76yfawqxbwwb35aa57b723j3z9fx5a2w16nls02yk2kqyn";
41
42
};
42
43
"test/test262/data" = fetchgit {
43
-
url = "${git_url}/external/github.com/tc39/test262.git";
44
-
rev = "1b911a8f8abf4cb63882cfbe72dcd4c82bb8ad91";
45
-
sha256 = "1hbp7vv41k7jka8azc78hhw4qng7gckr6dz1van7cyd067znwvr4";
44
+
url = "${git_url}/external/github.com/tc39/test262.git";
45
+
rev = "a6c1d05ac4fed084fa047e4c52ab2a8c9c2a8aef";
46
+
sha256 = "1cy3val2ih6r4sbaxd1v9fir87mrlw1kr54s64g68gnch53ck9s3";
46
47
};
47
48
"test/test262/harness" = fetchgit {
48
-
url = "${git_url}/external/github.com/test262-utils/test262-harness-py.git";
49
-
rev = "0f2acdd882c84cff43b9d60df7574a1901e2cdcd";
49
+
url = "${git_url}/external/github.com/test262-utils/test262-harness-py.git";
50
+
rev = "0f2acdd882c84cff43b9d60df7574a1901e2cdcd";
50
51
sha256 = "00brj5avp43yamc92kinba2mg3a2x1rcd7wnm7z093l73idprvkp";
51
52
};
52
53
"test/wasm-js" = fetchgit {
53
-
url = "${git_url}/external/github.com/WebAssembly/spec.git";
54
-
rev = "17b4a4d98c80b1ec736649d5a73496a0e6d12d4c";
55
-
sha256 = "03nyrrqffzj6xrmqi1v7f9m9395bdk53x301fy5mcq4hhpq6rsjr";
54
+
url = "${git_url}/external/github.com/WebAssembly/spec.git";
55
+
rev = "2113ea7e106f8a964e0445ba38f289d2aa845edd";
56
+
sha256 = "07aw7x2xzmzk905mqf8gbbb1bi1a5kv99g8iv6x2p07d3zns7xzx";
56
57
};
57
-
"testing/gmock" = fetchgit {
58
-
url = "${git_url}/external/googlemock.git";
59
-
rev = "0421b6f358139f02e102c9c332ce19a33faf75be";
60
-
sha256 = "1xiky4v98maxs8fg1avcd56y0alv3hw8qyrlpd899zgzbq2k10pp";
58
+
"third_party/depot_tools" = fetchgit {
59
+
url = "${git_url}/chromium/tools/depot_tools.git";
60
+
rev = "fb734036f4b5ae6d5afc63cbfc41d3a5d1c29a82";
61
+
sha256 = "1738y7xgfnn0hfdr8g5jw7555841ycxbn580mdffwv4jnbn7120s";
61
62
};
62
-
"testing/gtest" = fetchgit {
63
-
url = "${git_url}/external/github.com/google/googletest.git";
64
-
rev = "6f8a66431cb592dad629028a50b3dd418a408c87";
65
-
sha256 = "0bdba2lr6pg15bla9600zg0r0vm4lnrx0wqz84p376wfdxra24vw";
63
+
"third_party/googletest/src" = fetchgit {
64
+
url = "${git_url}/external/github.com/google/googletest.git";
65
+
rev = "ce468a17c434e4e79724396ee1b51d86bfc8a88b";
66
+
sha256 = "0nik8wb1b0zk2sslawgp5h211r5bc4x7m962dgnmbk11ccvsmr23";
66
67
};
67
68
"third_party/icu" = fetchgit {
68
-
url = "${git_url}/chromium/deps/icu.git";
69
-
rev = "08cb956852a5ccdba7f9c941728bb833529ba3c6";
70
-
sha256 = "0vn2iv068kmcjqqx5cgyha80x9iraz11hpx3q4n3rkvrlvbb3d7b";
69
+
url = "${git_url}/chromium/deps/icu.git";
70
+
rev = "a9a2bd3ee4f1d313651c5272252aaf2a3e7ed529";
71
+
sha256 = "1bfyxakgv9z0rxbqsy5csi85kg8dqy7i6zybmng5wyzag9cns4f9";
71
72
};
72
73
"third_party/instrumented_libraries" = fetchgit {
73
-
url = "${git_url}/chromium/src/third_party/instrumented_libraries.git";
74
-
rev = "644afd349826cb68204226a16c38bde13abe9c3c";
75
-
sha256 = "0d1vkwilgv1a4ghazn623gwmm7h51padpfi94qrmig1y748xfwfa";
74
+
url = "${git_url}/chromium/src/third_party/instrumented_libraries.git";
75
+
rev = "323cf32193caecbf074d1a0cb5b02b905f163e0f";
76
+
sha256 = "0q3n3ivqva28qpn67ds635521pwzpc9apcyagz65i9j17bb1k231";
76
77
};
77
-
# templates of code generator require jinja2 2.8 (while nixpkgs has 2.9.5, which breaks the template)
78
78
"third_party/jinja2" = fetchgit {
79
-
url = "${git_url}/chromium/src/third_party/jinja2.git";
80
-
rev = "d34383206fa42d52faa10bb9931d6d538f3a57e0";
81
-
sha256 = "0d9hyw0bvp3p0dbwy833cm9vdqxcam0qbm9jc561ynphddxlkmgd";
79
+
url = "${git_url}/chromium/src/third_party/jinja2.git";
80
+
rev = "b41863e42637544c2941b574c7877d3e1f663e25";
81
+
sha256 = "1qgilclkav67m6cl2xq2kmzkswrkrb2axc2z8mw58fnch4j1jf1r";
82
82
};
83
83
"third_party/markupsafe" = fetchgit {
84
-
url = "${git_url}/chromium/src/third_party/markupsafe.git";
85
-
rev = "8f45f5cfa0009d2a70589bcda0349b8cb2b72783";
84
+
url = "${git_url}/chromium/src/third_party/markupsafe.git";
85
+
rev = "8f45f5cfa0009d2a70589bcda0349b8cb2b72783";
86
86
sha256 = "168ppjmicfdh4i1l0l25s86mdbrz9fgxmiq1rx33x79mph41scfz";
87
87
};
88
+
"third_party/proguard" = fetchgit {
89
+
url = "${git_url}/chromium/src/third_party/proguard.git";
90
+
rev = "eba7a98d98735b2cc65c54d36baa5c9b46fe4f8e";
91
+
sha256 = "1yx86z2p243b0ykixgqz6nlqfp8swa6n0yl5fgb29fa4jvsjz3d1";
92
+
};
88
93
"tools/clang" = fetchgit {
89
-
url = "${git_url}/chromium/src/tools/clang.git";
90
-
rev = "40f69660bf3cd407e72b8ae240fdd6c513dddbfe";
91
-
sha256 = "1plkb9dcn34yd6lad7w59s9vqwmcc592dasgdk232spkafpg8qcf";
94
+
url = "${git_url}/chromium/src/tools/clang.git";
95
+
rev = "c0b1d892b2bc1291eb287d716ca239c1b03fb215";
96
+
sha256 = "1mz1pqzr2b37mymbkqkmpmj48j7a8ig0ibaw3dfilbx5nbl4wd2z";
97
+
};
98
+
"tools/gyp" = fetchgit {
99
+
url = "${git_url}/external/gyp.git";
100
+
rev = "d61a9397e668fa9843c4aa7da9e79460fe590bfb";
101
+
sha256 = "1z081h72mjy285jb1kj5xd0pb4p12n9blvsimsavyn3ldmswv0r0";
102
+
};
103
+
"tools/luci-go" = fetchgit {
104
+
url = "${git_url}/chromium/src/tools/luci-go.git";
105
+
rev = "abcd908f74fdb155cc8870f5cae48dff1ece7c3c";
106
+
sha256 = "07c8vanc31wal6aw8v0s499l7ifrgvdvi2sx4ln3nyha5ngxinld";
107
+
};
108
+
"tools/swarming_client" = fetchgit {
109
+
url = "${git_url}/infra/luci/client-py.git";
110
+
rev = "9a518d097dca20b7b00ce3bdfc5d418ccc79893a";
111
+
sha256 = "1d8nly7rp24gx7q0m01jvsc15nw5fahayfczwd40gzzzkmvhjazi";
92
112
};
93
113
};
94
114
···
96
116
97
117
stdenv.mkDerivation rec {
98
118
name = "v8-${version}";
99
-
version = "6.2.414.27";
119
+
version = "6.9.427.14";
100
120
101
121
inherit doCheck;
102
122
···
104
124
owner = "v8";
105
125
repo = "v8";
106
126
rev = version;
107
-
sha256 = "15zrb9bcpnhljhrilqnjaak3a4xnhj8li6ra12g3gkrw3fzir9a2";
127
+
sha256 = "13d50iz87qh7v8l8kjky8wqs9rvz02pgw74q8crqi5ywnvvill1x";
108
128
};
109
129
110
130
postUnpack = ''
···
133
153
134
154
configurePhase = ''
135
155
tools/dev/v8gen.py -vv ${arch}.release -- \
136
-
is_component_build=true \
137
-
${if snapshot then "v8_use_external_startup_data=false" else "v8_use_snapshot=false" } \
138
-
is_clang=false \
139
-
linux_use_bundled_binutils=false \
140
-
treat_warnings_as_errors=false
156
+
is_component_build=true \
157
+
${if snapshot then "v8_use_external_startup_data=false" else "v8_use_snapshot=false"} \
158
+
is_clang=false \
159
+
linux_use_bundled_binutils=false \
160
+
treat_warnings_as_errors=false \
161
+
use_custom_libcxx=false \
162
+
use_custom_libcxx_for_host=false
141
163
'';
142
164
143
165
nativeBuildInputs = [ gn ninja pkgconfig ];