From 3d319b82645ef787b953e4919855f8b14ed1e0cb Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Tue, 10 Jun 2014 06:12:40 -0500
Subject: [PATCH] Remove old hiphop-vm package

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 .../interpreters/hiphopvm/default.nix         | 61 -------------------
 .../interpreters/hiphopvm/tbb.patch           | 13 ----
 pkgs/top-level/all-packages.nix               |  7 +--
 3 files changed, 1 insertion(+), 80 deletions(-)
 delete mode 100644 pkgs/development/interpreters/hiphopvm/default.nix
 delete mode 100644 pkgs/development/interpreters/hiphopvm/tbb.patch

diff --git a/pkgs/development/interpreters/hiphopvm/default.nix b/pkgs/development/interpreters/hiphopvm/default.nix
deleted file mode 100644
index ae30d169b507..000000000000
--- a/pkgs/development/interpreters/hiphopvm/default.nix
+++ /dev/null
@@ -1,61 +0,0 @@
-{ stdenv, fetchurl, fetchgit, cmake, boost, libunwind, mysql, libmemcached, pcre
-, libevent, gd, curl, libxml2, icu, flex, bison, openssl, zlib, php, re2c
-, expat, libcap, oniguruma, libdwarf, libmcrypt, inteltbb, gperftools, glog
-, bzip2, openldap, readline, libelf, uwimap, binutils, cyrus_sasl, pam, libpng
-}:
-assert stdenv.system == "x86_64-linux";
-let
-  src = fetchgit {
-    url = "git://github.com/facebook/hiphop-php.git";
-    rev = "1e23dec9f0b1ce8aaa5833d0527a369c8e254ffd";
-    sha256 = "0fblwgq8c3hmamw0m5d1mn8qhyqf14v2zf62cgrkvmbiz6jlrbr6";
-  };
-
-  libxml2_280 = stdenv.lib.overrideDerivation libxml2 (args: rec { 
-    name = "libxml2-2.8.0";
-
-    src = fetchurl {
-      url = "ftp://xmlsoft.org/libxml2/${name}.tar.gz";
-      sha256 = "0ak2mjwvanz91nwxf1kkgbhrkm85vhhkpj7ymz8r6lb84bix1qpj";
-    };
-
-    patches = [];
-  });
-
-  fbPatch = "${src}/hphp/third_party/libevent-1.4.14.fb-changes.diff";
-
-  libeventFB = stdenv.lib.overrideDerivation libevent (args: { patches = [fbPatch]; });
-in
-stdenv.mkDerivation {
-  name = "hiphop-php-1e23dec9f0";
-  inherit src;
-  dontUseCmakeBuildDir = true;
-  dontUseCmakeConfigure = true;
-  USE_HHVM=1;
-  preConfigure = ''
-    export HPHP_LIB=$PWD/bin
-    export TBB_INSTALL_DIR=${inteltbb}
-    export TBB_ARCH_PLATFORM="intel64/cc4.1.0_libc2.4_kernel2.6.16.21"
-    sed 's=/bin/bash=/${stdenv.shell}=g' -i hphp/util/generate-buildinfo.sh
-  '';
-  NIX_LDFLAGS = "-lpam -L${pam}/lib";
-  MYSQL_INCLUDE_DIR="${mysql}/include/mysql";
-  MYSQL_DIR=mysql;
-  buildInputs = [ 
-    cmake boost libunwind mysql libmemcached pcre libeventFB gd curl
-    libxml2_280 icu flex bison openssl zlib php expat libcap oniguruma
-    libdwarf libmcrypt inteltbb gperftools bzip2 openldap readline
-    libelf uwimap binutils cyrus_sasl pam glog libpng
-  ];
-  installPhase = ''
-    mkdir -p $out/bin
-    cp hphp/hhvm/hhvm $out/bin
-  '';
-  patches = [./tbb.patch];
-
-  meta = {
-    description = "High performance PHP toolchain";
-    homepage = https://github.com/facebook/hiphop-php;
-    platforms = ["x86_64-linux"];
-  };
-}
diff --git a/pkgs/development/interpreters/hiphopvm/tbb.patch b/pkgs/development/interpreters/hiphopvm/tbb.patch
deleted file mode 100644
index 0dee06d00fd7..000000000000
--- a/pkgs/development/interpreters/hiphopvm/tbb.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/CMake/FindTBB.cmake b/CMake/FindTBB.cmake
-index 6a09c85..977418c 100644
---- a/CMake/FindTBB.cmake
-+++ b/CMake/FindTBB.cmake
-@@ -164,7 +164,7 @@ mark_as_advanced(TBB_INCLUDE_DIR)
- #-- Look for libraries
- # GvdB: $ENV{TBB_ARCH_PLATFORM} is set by the build script tbbvars[.bat|.sh|.csh]
- if (NOT $ENV{TBB_ARCH_PLATFORM} STREQUAL "")
--    set (TBB_LIBRARY_DIR "${_TBB_INSTALL_DIR}/$ENV{TBB_ARCH_PLATFORM}/lib")
-+    set (TBB_LIBRARY_DIR "${_TBB_INSTALL_DIR}/lib/$ENV{TBB_ARCH_PLATFORM}")
- else (NOT $ENV{TBB_ARCH_PLATFORM} STREQUAL "")
-     # HH: deprecated
-     message(STATUS "[Warning] FindTBB.cmake: The use of TBB_ARCHITECTURE and TBB_COMPILER is deprecated and may not be supported in future versions. Please set $ENV{TBB_ARCH_PLATFORM} (using tbbvars.[bat|csh|sh]).")
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c0b358c5c649..f9ccb8c4db6b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2940,12 +2940,7 @@ let
   haxe = callPackage ../development/compilers/haxe { };
 
   hhvm = callPackage ../development/compilers/hhvm { };
-
-  hiphopvm = callPackage ../development/interpreters/hiphopvm {
-    libevent = libevent14;
-    boost = boost149;
-    stdenv = overrideGCC stdenv gcc48;
-  };
+  hiphopvm = hhvm; /* Compatibility alias */
 
   falcon = builderDefsPackage (import ../development/interpreters/falcon) {
     inherit cmake;