summary refs log tree commit diff
path: root/pkgs/development/compilers
diff options
context:
space:
mode:
authorOrivej Desh <orivej@gmx.fr>2017-12-10 11:50:41 +0000
committerGitHub <noreply@github.com>2017-12-10 11:50:41 +0000
commit166536e152ad52825095a7b50df070b4f409b4fb (patch)
treee305c9605b859ced6cb2cba7d676bd447f47fdb5 /pkgs/development/compilers
parentd98d944d5d6e378ff40abf92b77ed3b4050fa058 (diff)
parentd5d7220770dd85b69eeacc97c29020e49a100987 (diff)
downloadnixlib-166536e152ad52825095a7b50df070b4f409b4fb.tar
nixlib-166536e152ad52825095a7b50df070b4f409b4fb.tar.gz
nixlib-166536e152ad52825095a7b50df070b4f409b4fb.tar.bz2
nixlib-166536e152ad52825095a7b50df070b4f409b4fb.tar.lz
nixlib-166536e152ad52825095a7b50df070b4f409b4fb.tar.xz
nixlib-166536e152ad52825095a7b50df070b4f409b4fb.tar.zst
nixlib-166536e152ad52825095a7b50df070b4f409b4fb.zip
Merge pull request #32535 from Gerschtli/update/hhvm
hhvm: 3.21 -> 3.23.2
Diffstat (limited to 'pkgs/development/compilers')
-rw-r--r--pkgs/development/compilers/hhvm/default.nix12
1 files changed, 4 insertions, 8 deletions
diff --git a/pkgs/development/compilers/hhvm/default.nix b/pkgs/development/compilers/hhvm/default.nix
index 4159b7bd52b7..2f84387a8888 100644
--- a/pkgs/development/compilers/hhvm/default.nix
+++ b/pkgs/development/compilers/hhvm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, fetchurl, cmake, pkgconfig, boost, libunwind, libmemcached
+{ stdenv, fetchgit, cmake, pkgconfig, boost, libunwind, libmemcached
 , pcre, libevent, gd, curl, libxml2, icu, flex, bison, openssl, zlib, php
 , expat, libcap, oniguruma, libdwarf, libmcrypt, tbb, gperftools, glog, libkrb5
 , bzip2, openldap, readline, libelf, uwimap, binutils, cyrus_sasl, pam, libpng
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation rec {
   name    = "hhvm-${version}";
-  version = "3.21";
+  version = "3.23.2";
 
   # use git version since we need submodules
   src = fetchgit {
     url    = "https://github.com/facebook/hhvm.git";
-    rev    = "56483773e2edd9e61782f1901ce40e47959e71b8";
-    sha256 = "0dmdk98nv04m0fv6909gfbsxqlkckn369yi7kadhir0r7vxsj7wa";
+    rev    = "HHVM-${version}";
+    sha256 = "1nic49j8nghx82lgvz0b95r78sqz46qaaqv4nx48p8yrj9ysnd7i";
     fetchSubmodules = true;
   };
 
@@ -29,10 +29,6 @@ stdenv.mkDerivation rec {
 
   patches = [
     ./flexible-array-members-gcc6.patch
-    (fetchurl {
-      url = https://github.com/facebook/hhvm/commit/b506902af2b7c53de6d6c92491c2086472292004.patch;
-      sha256 = "1br7diczqks6b1xjrdsac599fc62m9l17gcx7dvkc0qj54lq7ys4";
-    })
   ];
 
   enableParallelBuilding = true;