From 852a93a6c88c4bc4b3aab651bc31c895812b3a8c Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 31 Mar 2022 22:04:13 +0200 Subject: [PATCH] hhvm: remove after being marked broken for over two years It was marked in commit f23c7658271e83d3ba903c8bd9655737ee959b39 by Vincent Laporte on 2018-08-29 (commited on 2018-08-29) --- pkgs/development/compilers/hhvm/default.nix | 68 ------------------- .../hhvm/flexible-array-members-gcc6.patch | 20 ------ pkgs/top-level/all-packages.nix | 2 - 3 files changed, 90 deletions(-) delete mode 100644 pkgs/development/compilers/hhvm/default.nix delete mode 100644 pkgs/development/compilers/hhvm/flexible-array-members-gcc6.patch diff --git a/pkgs/development/compilers/hhvm/default.nix b/pkgs/development/compilers/hhvm/default.nix deleted file mode 100644 index d8495977e780..000000000000 --- a/pkgs/development/compilers/hhvm/default.nix +++ /dev/null @@ -1,68 +0,0 @@ -{ lib, stdenv, fetchgit, cmake, pkg-config, 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 -, libxslt, freetype, gdb, git, perl, libmysqlclient, gmp, libyaml, libedit -, libvpx, imagemagick, fribidi, gperf, which, ocamlPackages -}: - -stdenv.mkDerivation rec { - pname = "hhvm"; - version = "3.23.2"; - - # use git version since we need submodules - src = fetchgit { - url = "https://github.com/facebook/hhvm.git"; - rev = "HHVM-${version}"; - sha256 = "1nic49j8nghx82lgvz0b95r78sqz46qaaqv4nx48p8yrj9ysnd7i"; - fetchSubmodules = true; - }; - - nativeBuildInputs = [ cmake pkg-config flex bison ]; - buildInputs = - [ boost libunwind libmysqlclient libmemcached pcre gdb git perl - libevent gd curl libxml2 icu openssl zlib php expat libcap - oniguruma libdwarf libmcrypt tbb gperftools bzip2 openldap readline - libelf uwimap binutils cyrus_sasl pam glog libpng libxslt libkrb5 - gmp libyaml libedit libvpx imagemagick fribidi gperf which - ocamlPackages.ocaml ocamlPackages.ocamlbuild - ]; - - patches = [ - ./flexible-array-members-gcc6.patch - ]; - - dontUseCmakeBuildDir = true; - NIX_LDFLAGS = "-lpam -L${pam}/lib"; - - # work around broken build system - NIX_CFLAGS_COMPILE = "-I${freetype.dev}/include/freetype2"; - - # the cmake package does not handle absolute CMAKE_INSTALL_INCLUDEDIR correctly - # (setting it to an absolute path causes include files to go to $out/$out/include, - # because the absolute path is interpreted with root at $out). - cmakeFlags = [ "-DCMAKE_INSTALL_INCLUDEDIR=include" ]; - - prePatch = '' - 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 \ - hphp/runtime/ext_zend_compat/php-src/main/*.cpp \ - hphp/runtime/ext_zend_compat/php-src/main/*.h - sed '1i#include ' -i third-party/mcrouter/src/mcrouter/lib/cycles/Cycles.h - patchShebangs . - ''; - - meta = { - description = "High-performance JIT compiler for PHP/Hack"; - homepage = "https://hhvm.com"; - license = "PHP/Zend"; - platforms = [ "x86_64-linux" ]; - maintainers = [ lib.maintainers.thoughtpolice ]; - broken = true; # Since 2018-04-21, see https://hydra.nixos.org/build/73059373 - }; -} diff --git a/pkgs/development/compilers/hhvm/flexible-array-members-gcc6.patch b/pkgs/development/compilers/hhvm/flexible-array-members-gcc6.patch deleted file mode 100644 index 61b6e5e8d8c3..000000000000 --- a/pkgs/development/compilers/hhvm/flexible-array-members-gcc6.patch +++ /dev/null @@ -1,20 +0,0 @@ -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 -+++ b/third-party/re2/src/re2/dfa.cc -@@ -101,8 +101,13 @@ class DFA { - uint flag_; // Empty string bitfield flags in effect on the way - // into this state, along with kFlagMatch if this - // is a matching state. -- std::atomic next_[]; // Outgoing arrows from State, -- // one per input byte class -+// Work around the bug affecting flexible array members in GCC 6.1 and 6.2. -+// (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=70932) -+#if !defined(__clang__) && defined(__GNUC__) && __GNUC__ == 6 && __GNUC_MINOR__ >= 1 -+ std::atomic next_[0]; // Outgoing arrows from State, one per input byte class -+#else -+ std::atomic next_[]; // Outgoing arrows from State, one per input byte class -+#endif - }; - - enum { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index da42fc7efc1b..8a00a8e2164b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12719,8 +12719,6 @@ with pkgs; haxePackages = recurseIntoAttrs (callPackage ./haxe-packages.nix { }); inherit (haxePackages) hxcpp; - hhvm = callPackage ../development/compilers/hhvm { }; - hop = callPackage ../development/compilers/hop { }; falcon = callPackage ../development/interpreters/falcon { };