ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-17 06:06:13 +03:00
Code Issues Projects Releases Wiki Activity

hhvm: 3.15.8 -> 3.21

Browse Source
This commit is contained in:
Piotr Bogdan 2017-08-30 18:40:20 +01:00 committed by Robin Gloster
parent 51c247a074
commit 80351add5a
2 changed files with 7 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/development/compilers/hhvm/default.nix
View File

@ -3,18 +3,18 @@
, expat, libcap, oniguruma, libdwarf, libmcrypt, tbb, gperftools, glog, libkrb5
, bzip2, openldap, readline, libelf, uwimap, binutils, cyrus_sasl, pam, libpng
, libxslt, ocaml, freetype, gdb, git, perl, mariadb, gmp, libyaml, libedit
, libvpx, imagemagick, fribidi, gperf
, libvpx, imagemagick, fribidi, gperf, which
}:
stdenv.mkDerivation rec {
name = "hhvm-${version}";
version = "3.15.8";
version = "3.21";
# use git version since we need submodules
src = fetchgit {
url = "https://github.com/facebook/hhvm.git";
rev = "983bdab781d9d7bff5f14a4a2827c2c217c500df";
sha256 = "0sbjwdy69x08c4w0vf83dcfx3fin8qqysl9pacy2j6p0hxvgn5r5";
rev = "56483773e2edd9e61782f1901ce40e47959e71b8";
sha256 = "0dmdk98nv04m0fv6909gfbsxqlkckn369yi7kadhir0r7vxsj7wa";
fetchSubmodules = true;
};
@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
libevent gd curl libxml2 icu flex bison openssl zlib php expat libcap
oniguruma libdwarf libmcrypt tbb gperftools bzip2 openldap readline
libelf uwimap binutils cyrus_sasl pam glog libpng libxslt ocaml libkrb5
gmp libyaml libedit libvpx imagemagick fribidi gperf
gmp libyaml libedit libvpx imagemagick fribidi gperf which
];
patches = [
@ -43,10 +43,10 @@ stdenv.mkDerivation rec {
cmakeFlags = "-DCMAKE_INSTALL_INCLUDEDIR=include";
prePatch = ''
substituteInPlace hphp/util/generate-buildinfo.sh \
--replace /bin/bash ${stdenv.shell}
substituteInPlace ./configure \
--replace "/usr/bin/env bash" ${stdenv.shell}
substituteInPlace ./third-party/ocaml/CMakeLists.txt \
--replace "/bin/bash" ${stdenv.shell}
perl -pi -e 's/([ \t(])(isnan|isinf)\(/$1std::$2(/g' \
hphp/runtime/base/*.cpp \
hphp/runtime/ext/std/*.cpp \

13
pkgs/development/compilers/hhvm/flexible-array-members-gcc6.patch
View File

@ -1,16 +1,3 @@
diff --git a/hphp/runtime/vm/bytecode.h b/hphp/runtime/vm/bytecode.h
index ddc7b69..edf807c 100644
--- a/hphp/runtime/vm/bytecode.h
+++ b/hphp/runtime/vm/bytecode.h
@@ -124,7 +124,7 @@ private:
static void* allocMem(unsigned nargs);
private:
- TypedValue m_extraArgs[];
+ TypedValue m_extraArgs[0];
TYPE_SCAN_FLEXIBLE_ARRAY_FIELD(m_extraArgs);
};
diff --git a/third-party/re2/src/re2/dfa.cc b/third-party/re2/src/re2/dfa.cc
index 483f678..3aa3610 100644
--- a/third-party/re2/src/re2/dfa.cc