tangled
alpha
login
or
join now
pyrox.dev
/
nixpkgs
lol
0
fork
atom
overview
issues
pulls
pipelines
v8: 7.4.255 -> 8.4.255
talyz
4 years ago
30cae53d
5bf0e509
+52
-25
4 changed files
expand all
collapse all
unified
split
pkgs
development
libraries
v8
default.nix
gcc_arm.patch
top-level
all-packages.nix
php-packages.nix
+17
-17
pkgs/development/libraries/v8/default.nix
···
11
11
deps = {
12
12
"base/trace_event/common" = fetchgit {
13
13
url = "${git_url}/chromium/src/base/trace_event/common.git";
14
14
-
rev = "936ba8a963284a6b3737cf2f0474a7131073abee";
15
15
-
sha256 = "14nr22fqdpxma1kzjflj6a865vr3hfnnm2gs4vcixyq4kmfzfcy2";
14
14
+
rev = "dab187b372fc17e51f5b9fad8201813d0aed5129";
15
15
+
sha256 = "0dmpj9hj4xv3xb0fl1kb9hm4bhpbs2s5csx3z8cgjd5vwvhdzig4";
16
16
};
17
17
build = fetchgit {
18
18
url = "${git_url}/chromium/src/build.git";
19
19
-
rev = "325e95d6dae64f35b160b3dc7d73218cee5ec079";
20
20
-
sha256 = "0dddyxa76p2xpjhmxif05v63i5ar6h5v684fdl667sg84f5bhhxf";
19
19
+
rev = "26e9d485d01d6e0eb9dadd21df767a63494c8fea";
20
20
+
sha256 = "1jjvsgj0cs97d26i3ba531ic1f9gqan8x7z4aya8yl8jx02l342q";
21
21
};
22
22
"third_party/googletest/src" = fetchgit {
23
23
url = "${git_url}/external/github.com/google/googletest.git";
24
24
-
rev = "5ec7f0c4a113e2f18ac2c6cc7df51ad6afc24081";
25
25
-
sha256 = "0gmr10042c0xybxnn6g7ndj1na1mmd3l9w7449qlcv4s8gmfs7k6";
24
24
+
rev = "e3f0319d89f4cbf32993de595d984183b1a9fc57";
25
25
+
sha256 = "18xz71l2xjrqsc0q317whgw4xi1i5db24zcj7v04f5g6r1hyf1a5";
26
26
};
27
27
"third_party/icu" = fetchgit {
28
28
url = "${git_url}/chromium/deps/icu.git";
29
29
-
rev = "960f195aa87acaec46e6104ec93a596da7ae0843";
30
30
-
sha256 = "073kh6gpcairgjxf3hlhpqljc13gwl2aj8fz91fv220xibwqs834";
29
29
+
rev = "f2223961702f00a8833874b0560d615a2cc42738";
30
30
+
sha256 = "0z5p53kbrjfkjn0i12dpk55cp8976j2zk7a4wk88423s2c5w87zl";
31
31
};
32
32
"third_party/jinja2" = fetchgit {
33
33
url = "${git_url}/chromium/src/third_party/jinja2.git";
···
39
39
rev = "8f45f5cfa0009d2a70589bcda0349b8cb2b72783";
40
40
sha256 = "168ppjmicfdh4i1l0l25s86mdbrz9fgxmiq1rx33x79mph41scfz";
41
41
};
42
42
+
"third_party/zlib" = fetchgit {
43
43
+
url = "${git_url}/chromium/src/third_party/zlib.git";
44
44
+
rev = "156be8c52f80cde343088b4a69a80579101b6e67";
45
45
+
sha256 = "0hxbkkzmlv714fjq2jlp5dd2jc339xyh6gkjx1sz3srwv33mlk92";
46
46
+
};
42
47
};
43
48
44
49
in
45
50
46
51
stdenv.mkDerivation rec {
47
52
pname = "v8";
48
48
-
version = "7.4.255";
53
53
+
version = "8.4.255";
49
54
50
55
doCheck = true;
51
56
52
57
patches = [
53
53
-
(fetchpatch {
54
54
-
url = "https://raw.githubusercontent.com/RPi-Distro/chromium-browser/master/debian/patches/revert-Xclang-instcombine-lower-dbg-declare.patch";
55
55
-
sha256 = "02hczcg43m36q8j1kv5j3hq9czj9niiil9w13w22vzv2f3c67dvn";
56
56
-
})
57
58
./darwin.patch
59
59
+
./gcc_arm.patch # Fix building zlib with gcc on aarch64, from https://gist.github.com/Adenilson/d973b6fd96c7709d33ddf08cf1dcb149
58
60
];
59
61
60
62
src = fetchFromGitHub {
61
63
owner = "v8";
62
64
repo = "v8";
63
65
rev = version;
64
64
-
sha256 = "14i0c71hmffzqnq9n73dh9dnabdxhbjhzkhqpk5yv9y90bwrzi2n";
66
66
+
sha256 = "07ymw4kqbz7kv311gpk5bs5q90wj73n2q7jkyfhqk4hvhs1q5bw7";
65
67
};
66
68
67
69
postUnpack = ''
···
97
99
''v8_snapshot_toolchain="//build/toolchain/linux/unbundle:default"''
98
100
] ++ lib.optional stdenv.cc.isClang ''clang_base_path="${stdenv.cc}"'';
99
101
100
100
-
# with gcc8, -Wclass-memaccess became part of -Wall and causes logging limit
101
101
-
# to be exceeded
102
102
-
NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isGNU "-Wno-class-memaccess";
102
102
+
NIX_CFLAGS_COMPILE = "-O2";
103
103
104
104
nativeBuildInputs = [ gn ninja pkg-config python ]
105
105
++ lib.optionals stdenv.isDarwin [ xcbuild darwin.DarwinTools ];
+31
pkgs/development/libraries/v8/gcc_arm.patch
···
1
1
+
diff --git a/third_party/zlib/contrib/optimizations/insert_string.h b/third_party/zlib/contrib/optimizations/insert_string.h
2
2
+
index 1826601..d123305 100644
3
3
+
--- a/third_party/zlib/contrib/optimizations/insert_string.h
4
4
+
+++ b/third_party/zlib/contrib/optimizations/insert_string.h
5
5
+
@@ -26,15 +26,23 @@
6
6
+
#define _cpu_crc32_u32 _mm_crc32_u32
7
7
+
8
8
+
#elif defined(CRC32_ARMV8_CRC32)
9
9
+
- #if defined(__clang__)
10
10
+
+ #if defined(__GNUC__) || defined(__clang__)
11
11
+
#undef TARGET_CPU_WITH_CRC
12
12
+
- #define __crc32cw __builtin_arm_crc32cw
13
13
+
+ #if defined(__clang__)
14
14
+
+ #define __crc32cw __builtin_arm_crc32cw
15
15
+
+ #elif defined(__GNUC__)
16
16
+
+ #define __crc32cw __builtin_aarch64_crc32cw
17
17
+
+ #endif
18
18
+
#endif
19
19
+
20
20
+
#define _cpu_crc32_u32 __crc32cw
21
21
+
22
22
+
#if defined(__aarch64__)
23
23
+
- #define TARGET_CPU_WITH_CRC __attribute__((target("crc")))
24
24
+
+ #if defined(__clang__)
25
25
+
+ #define TARGET_CPU_WITH_CRC __attribute__((target("crc")))
26
26
+
+ #elif defined(__GNUC__)
27
27
+
+ #define TARGET_CPU_WITH_CRC __attribute__((target("+crc")))
28
28
+
+ #endif
29
29
+
#else // !defined(__aarch64__)
30
30
+
#define TARGET_CPU_WITH_CRC __attribute__((target("armv8-a,crc")))
31
31
+
#endif // defined(__aarch64__)
-4
pkgs/top-level/all-packages.nix
···
17492
17492
stdenv = gcc6Stdenv;
17493
17493
});
17494
17494
17495
17495
-
v8_6_x = v8;
17496
17495
v8 = callPackage ../development/libraries/v8 {
17497
17496
inherit (python2Packages) python;
17498
17498
-
} // lib.optionalAttrs stdenv.isLinux {
17499
17499
-
# doesn't build with gcc7
17500
17500
-
stdenv = gcc6Stdenv;
17501
17497
};
17502
17498
17503
17499
vaapiIntel = callPackage ../development/libraries/vaapi-intel { };
+4
-4
pkgs/top-level/php-packages.nix
···
146
146
147
147
sha256 = "103nys7zkpi1hifqp9miyl0m1mn07xqshw3sapyz365nb35g5q71";
148
148
149
149
-
buildInputs = [ pkgs.v8_6_x ];
150
150
-
configureFlags = [ "--with-v8=${pkgs.v8_6_x}" ];
149
149
+
buildInputs = [ pkgs.v8 ];
150
150
+
configureFlags = [ "--with-v8=${pkgs.v8}" ];
151
151
152
152
meta.maintainers = lib.teams.php.members;
153
153
meta.broken = true;
···
159
159
160
160
sha256 = "0g63dyhhicngbgqg34wl91nm3556vzdgkq19gy52gvmqj47rj6rg";
161
161
162
162
-
buildInputs = [ pkgs.v8_6_x ];
163
163
-
configureFlags = [ "--with-v8js=${pkgs.v8_6_x}" ];
162
162
+
buildInputs = [ pkgs.v8 ];
163
163
+
configureFlags = [ "--with-v8js=${pkgs.v8}" ];
164
164
165
165
meta.maintainers = lib.teams.php.members;
166
166
meta.broken = true;