From 7bc6fa344a2fe616135696b2f26a328e6235366b Mon Sep 17 00:00:00 2001 From: Stefan Siegl Date: Sun, 4 Sep 2016 19:23:51 +0200 Subject: [PATCH 1/3] php70Packages.v8js: init at 1.3.2 --- pkgs/top-level/php-packages.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index e8af3c2dbf9b..ed75997e7ef8 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -207,6 +207,16 @@ let }; }; + v8js = assert isPhp7; buildPecl rec { + version = "1.3.2"; + name = "v8js-${version}"; + + sha256 = "1x7gxi70zgj3vaxs89nfbnwlqcxrps1inlyfzz66pbzdbfwvc8z8"; + + buildInputs = [ pkgs.v8 ]; + configureFlags = [ "--with-v8js=${pkgs.v8}" ]; + }; + composer = pkgs.stdenv.mkDerivation rec { name = "composer-${version}"; version = "1.2.0"; From df3103729e7a34585e236896f683b4efcc077554 Mon Sep 17 00:00:00 2001 From: Stefan Siegl Date: Sun, 4 Sep 2016 19:24:11 +0200 Subject: [PATCH 2/3] phpPackages.spidermonkey: init a 1.0.0 --- pkgs/top-level/php-packages.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index ed75997e7ef8..e0c5fc68af79 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -81,6 +81,19 @@ let buildInputs = with pkgs; [ pkgconfig cyrus_sasl ]; }; + # No support for PHP 7 yet (and probably never will be) + spidermonkey = assert !isPhp7; buildPecl rec { + name = "spidermonkey-1.0.0"; + + sha256 = "1ywrsp90w6rlgq3v2vmvp2zvvykkgqqasab7h9bf3vgvgv3qasbg"; + + configureFlags = [ + "--with-spidermonkey=${pkgs.spidermonkey_185}" + ]; + + buildInputs = [ pkgs.spidermonkey_185 ]; + }; + xdebug = if isPhp7 then xdebug24 else xdebug23; xdebug23 = assert !isPhp7; buildPecl { From c76c0bedc10a5443bce53915cb77b1c3dd89b2b0 Mon Sep 17 00:00:00 2001 From: Stefan Siegl Date: Sun, 4 Sep 2016 19:42:39 +0200 Subject: [PATCH 3/3] php70Packages.v8: init at 0.1.0 --- pkgs/top-level/php-packages.nix | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index e0c5fc68af79..9bebfa3d9158 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -220,6 +220,37 @@ let }; }; + v8 = assert isPhp7; buildPecl rec { + version = "0.1.0"; + name = "v8-${version}"; + + src = pkgs.fetchurl { + url = "https://github.com/pinepain/php-v8/archive/v${version}.tar.gz"; + sha256 = "18smnxd34b486f5n8j0wk9z7r5x1w84v89mgf76z0bn7gxdxl0xj"; + }; + + buildInputs = [ pkgs.v8 ]; + configureFlags = [ "--with-v8=${pkgs.v8}" ]; + + patches = [ + (builtins.toFile "link-libv8_libbase.patch" '' + Index: php-v8/config.m4 + =================================================================== + --- php-v8.orig/config.m4 + +++ php-v8/config.m4 + @@ -69,7 +69,7 @@ if test "$PHP_V8" != "no"; then + #static_link_extra="libv8_base.a libv8_libbase.a libv8_libplatform.a libv8_snapshot.a" + ;; + * ) + - static_link_extra="libv8_libplatform.a" + + static_link_extra="libv8_libplatform.a libv8_libbase.a" + #static_link_extra="libv8_base.a libv8_libbase.a libv8_libplatform.a libv8_snapshot.a" + ;; + esac + '' + )]; + }; + v8js = assert isPhp7; buildPecl rec { version = "1.3.2"; name = "v8js-${version}";