Skip to content

Commit 4569ee7

Browse files
thoughtpolicethoughtpolice
committed
plv8: unbreak build, bump to version 2.3.8
ee58a5b broke the plv8 build because it upgraded the v8_6_x expression everywhere to the 6.9 branch, which came with API changes. Notably, it seems plv8 only supports up-to v8 6.4.x at this time. This keeps a copy of the plv8_6_x expression inside the same directory as the other v8 versions (so patches, etc are easy to apply), but it is not exposed to the top-level of all-packages.nix. Signed-off-by: Austin Seipp <aseipp@pobox.com>
1 parent 965ae02 commit 4569ee7

3 files changed

Lines changed: 198 additions & 5 deletions

File tree

‎pkgs/development/libraries/v8/plv8_6_x.nix‎

Lines changed: 187 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,187 @@
1+
# NOTE: this expression is NOT exported from the top-level of all-packages.nix,
2+
# it is exclusively used by the 'plv8' PostgreSQL extension, which requires a
3+
# very exact version.
4+
5+
{ stdenv, lib, fetchgit, fetchFromGitHub, gn, ninja, python, glib, pkgconfig
6+
, doCheck ? false
7+
, snapshot ? true
8+
}:
9+
10+
let
11+
arch = if stdenv.isAarch32
12+
then if stdenv.is64bit
13+
then"arm64"
14+
else "arm"
15+
else if stdenv.is64bit
16+
then"x64"
17+
else "ia32";
18+
git_url = "https://chromium.googlesource.com";
19+
20+
# This data is from the DEPS file in the root of a V8 checkout
21+
deps = {
22+
"base/trace_event/common" = fetchgit {
23+
url = "${git_url}/chromium/src/base/trace_event/common.git";
24+
rev = "0e9a47d74970bee1bbfc063c47215406f8918699";
25+
sha256 = "07rbzrlscp8adh4z86yl5jxdnvgkc3xs950xldpk318wf9i3bh6c";
26+
};
27+
"build" = fetchgit {
28+
url = "${git_url}/chromium/src/build.git";
29+
rev = "9338ce52d0b9bcef34c38285fbd5023b62739fac";
30+
sha256 = "1s2sa8dy3waidsirjylc82ggb18l1108bczjc8z0v4ywyj4k0cvh";
31+
};
32+
"buildtools" = fetchgit {
33+
url = "${git_url}/chromium/buildtools.git";
34+
rev = "505de88083136eefd056e5ee4ca0f01fe9b33de8";
35+
sha256 = "0vj216nhb803bggsl0hnyagj8njrm96pn8sim6xcnqb7nhz1vabw";
36+
};
37+
"test/benchmarks/data" = fetchgit {
38+
url = "${git_url}/v8/deps/third_party/benchmarks.git";
39+
rev = "05d7188267b4560491ff9155c5ee13e207ecd65f";
40+
sha256 = "0ad2ay14bn67d61ks4dmzadfnhkj9bw28r4yjdjjyzck7qbnzchl";
41+
};
42+
"test/mozilla/data" = fetchgit {
43+
url = "${git_url}/v8/deps/third_party/mozilla-tests.git";
44+
rev = "f6c578a10ea707b1a8ab0b88943fe5115ce2b9be";
45+
sha256 = "0rfdan76yfawqxbwwb35aa57b723j3z9fx5a2w16nls02yk2kqyn";
46+
};
47+
"test/test262/data" = fetchgit {
48+
url = "${git_url}/external/github.com/tc39/test262.git";
49+
rev = "5d4c667b271a9b39d0de73aef5ffe6879c6f8811";
50+
sha256 = "0q9iwb2nkybf9np95wgf5m372aw2lhx9wlsw41a2a80kbkvb2kqg";
51+
};
52+
"test/test262/harness" = fetchgit {
53+
url = "${git_url}/external/github.com/test262-utils/test262-harness-py.git";
54+
rev = "0f2acdd882c84cff43b9d60df7574a1901e2cdcd";
55+
sha256 = "00brj5avp43yamc92kinba2mg3a2x1rcd7wnm7z093l73idprvkp";
56+
};
57+
"test/wasm-js" = fetchgit {
58+
url = "${git_url}/external/github.com/WebAssembly/spec.git";
59+
rev = "a7e226a92e660a3d5413cfea4269824f513259d2";
60+
sha256 = "0z3aybj3ykajwh2bv5fwd6pwqjjsq8dnwrqc2wncb6r9xcjwbgxp";
61+
};
62+
"testing/gtest" = fetchgit {
63+
url = "${git_url}/external/github.com/google/googletest.git";
64+
rev = "6f8a66431cb592dad629028a50b3dd418a408c87";
65+
sha256 = "0bdba2lr6pg15bla9600zg0r0vm4lnrx0wqz84p376wfdxra24vw";
66+
};
67+
"third_party/icu" = fetchgit {
68+
url = "${git_url}/chromium/deps/icu.git";
69+
rev = "741688ebf328da9adc52505248bf4e2ef868722c";
70+
sha256 = "02ifm18qjlrkn5nm2rxkf9yz9bdlyq7c65jfjndv63vi1drqh1r9";
71+
};
72+
"third_party/instrumented_libraries" = fetchgit {
73+
url = "${git_url}/chromium/src/third_party/instrumented_libraries.git";
74+
rev = "28417458ac4dc79f68915079d0f283f682504cc0";
75+
sha256 = "1qf5c2946n37p843yriv7xawi6ss6samabghq43s49cgd4wq8dc3";
76+
};
77+
"third_party/jinja2" = fetchgit {
78+
url = "${git_url}/chromium/src/third_party/jinja2.git";
79+
rev = "d34383206fa42d52faa10bb9931d6d538f3a57e0";
80+
sha256 = "0d9hyw0bvp3p0dbwy833cm9vdqxcam0qbm9jc561ynphddxlkmgd";
81+
};
82+
"third_party/markupsafe" = fetchgit {
83+
url = "${git_url}/chromium/src/third_party/markupsafe.git";
84+
rev = "8f45f5cfa0009d2a70589bcda0349b8cb2b72783";
85+
sha256 = "168ppjmicfdh4i1l0l25s86mdbrz9fgxmiq1rx33x79mph41scfz";
86+
};
87+
"tools/clang" = fetchgit {
88+
url = "${git_url}/chromium/src/tools/clang.git";
89+
rev = "8688d267571de76a56746324dcc249bf4232b85a";
90+
sha256 = "0krq4zz1vnwp064bm517gwr2napy18wyccdh8w5s4qgkjwwxd63s";
91+
};
92+
"tools/gyp" = fetchgit {
93+
url = "${git_url}/external/gyp.git";
94+
rev = "d61a9397e668fa9843c4aa7da9e79460fe590bfb";
95+
sha256 = "1z081h72mjy285jb1kj5xd0pb4p12n9blvsimsavyn3ldmswv0r0";
96+
};
97+
"tools/luci-go" = fetchgit {
98+
url = "${git_url}/chromium/src/tools/luci-go.git";
99+
rev = "45a8a51fda92e123619a69e7644d9c64a320b0c1";
100+
sha256 = "0r7736gqk7r0i7ig0b5ib10d9q8a8xzsmc0f0fbkm9k78v847vpj";
101+
};
102+
"tools/swarming_client" = fetchgit {
103+
url = "${git_url}/infra/luci/client-py.git";
104+
rev = "4bd9152f8a975d57c972c071dfb4ddf668e02200";
105+
sha256 = "03zk91gzvqv01g1vbl8d7h8al7vs4ymrrdc8ipg9wpq52yh65smh";
106+
};
107+
};
108+
109+
in
110+
111+
stdenv.mkDerivation rec {
112+
name = "v8-${version}";
113+
version = "6.4.388.40";
114+
115+
inherit doCheck;
116+
117+
src = fetchFromGitHub {
118+
owner = "v8";
119+
repo = "v8";
120+
rev = version;
121+
sha256 = "1lq239cgqyidrynz8g3wbdv70ymzv6s0ppad8s219gb3jnizm16a";
122+
};
123+
124+
postUnpack = ''
125+
${lib.concatStringsSep "\n" (
126+
lib.mapAttrsToList (n: v: ''
127+
mkdir -p $sourceRoot/${n}
128+
cp -r ${v}/* $sourceRoot/${n}
129+
'') deps)}
130+
'';
131+
132+
prePatch = ''
133+
# use our gn, not the bundled one
134+
sed -i -e 's#gn_path = .*#gn_path = "${gn}/bin/gn"#' tools/mb/mb.py
135+
136+
# disable tests
137+
if [ "$doCheck" = "" ]; then sed -i -e '/"test:gn_all",/d' BUILD.gn; fi
138+
139+
# disable sysroot usage
140+
chmod u+w build/config build/config/sysroot.gni
141+
sed -i build/config/sysroot.gni \
142+
-e '/use_sysroot =/ { s#\(use_sysroot =\).*#\1 false#; :a n; /current_cpu/ { s/^/#/; ba }; }'
143+
144+
# patch shebangs (/usr/bin/env)
145+
patchShebangs tools/dev/v8gen.py
146+
'';
147+
148+
configurePhase = ''
149+
tools/dev/v8gen.py -vv ${arch}.release -- \
150+
is_component_build=true \
151+
${if snapshot then "v8_use_external_startup_data=false" else "v8_use_snapshot=false"} \
152+
is_clang=false \
153+
linux_use_bundled_binutils=false \
154+
treat_warnings_as_errors=false \
155+
use_custom_libcxx=false \
156+
use_custom_libcxx_for_host=false
157+
'';
158+
159+
nativeBuildInputs = [ gn ninja pkgconfig ];
160+
buildInputs = [ python glib ];
161+
162+
buildPhase = ''
163+
ninja -C out.gn/${arch}.release/
164+
'';
165+
166+
enableParallelBuilding = true;
167+
168+
installPhase = ''
169+
install -vD out.gn/${arch}.release/d8 "$out/bin/d8"
170+
install -vD out.gn/${arch}.release/mksnapshot "$out/bin/mksnapshot"
171+
mkdir -p "$out/lib"
172+
for f in libicui18n.so libicuuc.so libv8_libbase.so libv8_libplatform.so libv8.so; do
173+
install -vD out.gn/${arch}.release/$f "$out/lib/$f"
174+
done
175+
install -vD out.gn/${arch}.release/icudtl.dat "$out/lib/icudtl.dat"
176+
mkdir -p "$out/include"
177+
cp -vr include/*.h "$out/include"
178+
cp -vr include/libplatform "$out/include"
179+
'';
180+
181+
meta = with lib; {
182+
description = "Google's open source JavaScript engine";
183+
maintainers = with maintainers; [ cstrahan proglodyte ];
184+
platforms = platforms.linux;
185+
license = licenses.bsd3;
186+
};
187+
}

‎pkgs/servers/sql/postgresql/plv8/default.nix‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
stdenv.mkDerivation rec {
44
name = "plv8-${version}";
5-
version = "2.1.0";
5+
version = "2.3.8";
66

77
nativeBuildInputs = [ perl ];
88
buildInputs = [ v8 postgresql ];
@@ -11,16 +11,20 @@ stdenv.mkDerivation rec {
1111
owner = "plv8";
1212
repo = "plv8";
1313
rev = "v${version}";
14-
sha256 = "1sfpxz0zcbinn6822j12lkwgrw9kfacrs83ic968rm489rl9w241";
14+
sha256 = "0hrmn1zzzdf52zwldg6axv57p0f3b279l9s8lbpijcv60fqrzx16";
1515
};
1616

17+
makeFlags = [ "--makefile=Makefile.shared" ];
18+
1719
preConfigure = ''
18-
substituteInPlace Makefile --replace '-lv8_libplatform' '-lv8_libplatform -lv8_libbase'
20+
patchShebangs ./generate_upgrade.sh
1921
'';
2022

23+
buildPhase = "make -f Makefile.shared all";
24+
2125
installPhase = ''
2226
mkdir -p $out/bin
23-
install -D plv8.so -t $out/lib
27+
install -D plv8*.so -t $out/lib
2428
install -D {plls,plcoffee,plv8}{--${version}.sql,.control} -t $out/share/extension
2529
'';
2630

‎pkgs/top-level/all-packages.nix‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11699,7 +11699,9 @@ with pkgs;
1169911699
pgroonga = callPackage ../servers/sql/postgresql/pgroonga {};
1170011700

1170111701
plv8 = callPackage ../servers/sql/postgresql/plv8 {
11702-
v8 = v8_6_x;
11702+
v8 = callPackage ../development/libraries/v8/plv8_6_x.nix {
11703+
inherit (python2Packages) python;
11704+
};
1170311705
};
1170411706

1170511707
phonon = callPackage ../development/libraries/phonon {};

0 commit comments

Comments
 (0)