From b2933434f5a899d851705f652909cbdb78e1029b Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Wed, 11 Mar 2020 21:35:53 +0100 Subject: phpPackages: Initial work for building phpExtensions separately --- pkgs/top-level/php-packages.nix | 55 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 54 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 5ef8e7226207..a2b4434aedee 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -1,4 +1,4 @@ -{ pkgs, fetchgit, php }: +{ stdenv, lib, pkgs, fetchgit, php, autoconf, pkgconfig, re2c }: let self = with self; { @@ -693,4 +693,57 @@ let nativeBuildInputs = [ pkgs.pkgconfig ]; }; + + exts = let + # Function to build a single php extension based on the php version. + # + # Name passed is the name of the extension and is automatically used + # to add the configureFlag "--enable-${name}", which can be overriden. + # + # Build inputs is used for extra deps that may be needed. + mkExtension = { + name + , configureFlags ? [ "--enable-${name}" ] + , buildInputs ? [] + , ... + }: stdenv.mkDerivation { + pname = "php-ext-${name}"; + + inherit (php) version src; + sourceRoot = "php-${php.version}/ext/${name}"; + + enableParallelBuilding = true; + nativeBuildInputs = [ php autoconf pkgconfig re2c ]; + inherit configureFlags buildInputs; + + preConfigure = "phpize"; + + installPhase = '' + mkdir -p $out/lib/php/extensions + cp modules/${name}.so $out/lib/php/extensions/ext-${name}.so + ''; + }; + + # This list contains build instructions for different modules that one may + # want to build. + # + # These will be passed as arguments to mkExtension above. + extensionData = [ + ]; + + # Convert the list of attrs: + # [ { name = ; ... } ... ] + # to a list of + # [ { name = ; value = ; } ... ] + # + # which we later use listToAttrs to make all attrs available by name. + # + # Also filter out extensions based on the enable property. + namedExtensions = builtins.map (drv: { + name = drv.name; + value = mkExtension drv; + }) (builtins.filter (i: i.enable or true) extensionData); + + # Produce the final attribute set of all extensions defined. + in builtins.listToAttrs namedExtensions; }; in self -- cgit 1.4.1 From 387d52106a0f3835b80a6759c5d0d9400a960916 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sat, 14 Mar 2020 08:48:41 +0100 Subject: phpPackages.exts: Add alias so we have the right pcre lib --- pkgs/top-level/php-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index a2b4434aedee..0e044fb04e9d 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -728,7 +728,9 @@ let # want to build. # # These will be passed as arguments to mkExtension above. - extensionData = [ + extensionData = let + pcre' = if (lib.versionAtLeast php.version "7.3") then pcre2 else pcre; + in [ ]; # Convert the list of attrs: -- cgit 1.4.1 From e0b1b9d556321d9361452ad8b7e3abf7e2de57d9 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Wed, 11 Mar 2020 21:54:53 +0100 Subject: phpPackages.exts: Add extensions --- pkgs/top-level/php-packages.nix | 162 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 161 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 0e044fb04e9d..167ed5273966 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -1,4 +1,8 @@ -{ stdenv, lib, pkgs, fetchgit, php, autoconf, pkgconfig, re2c }: +{ stdenv, lib, pkgs, fetchgit, php, autoconf, pkgconfig, re2c +, bzip2, curl, libxml2, openssl, gmp5, icu, oniguruma, libsodium, html-tidy +, libzip, zlib, pcre, pcre2, libxslt, aspell, openldap, cyrus_sasl, uwimap +, pam, libiconv, enchant1, libXpm, gd, libwebp, libjpeg, libpng, freetype +, libffi, freetds, postgresql, sqlite, recode, net-snmp }: let self = with self; { @@ -731,6 +735,162 @@ let extensionData = let pcre' = if (lib.versionAtLeast php.version "7.3") then pcre2 else pcre; in [ + { name = "bcmath"; } + { name = "bz2"; buildInputs = [ bzip2 ]; configureFlags = [ "--with-bz2=${bzip2.dev}" ]; } + { name = "calendar"; } + { name = "ctype"; } + { name = "curl"; buildInputs = [ curl ]; configureFlags = [ "--with-curl=${curl.dev}" ]; } + { name = "dba"; } + { name = "dom"; + buildInputs = [ libxml2 ]; + configureFlags = [ "--enable-dom" ] + # Required to build on darwin. + ++ lib.optional (lib.versionOlder php.version "7.4") [ "--with-libxml-dir=${libxml2.dev}" ]; } + { name = "enchant"; + buildInputs = [ enchant1 ]; + configureFlags = [ "--with-enchant=${enchant1}" ]; + # enchant1 doesn't build on darwin. + enable = (!stdenv.isDarwin); } + { name = "exif"; } + { name = "ffi"; buildInputs = [ libffi ]; enable = lib.versionAtLeast php.version "7.4"; } + { name = "fileinfo"; buildInputs = [ pcre' ]; } + { name = "filter"; buildInputs = [ pcre' ]; } + { name = "ftp"; buildInputs = [ openssl ]; } + { name = "gd"; + buildInputs = [ zlib gd ]; + configureFlags = [ + "--enable-gd" + "--with-external-gd=${gd.dev}" + "--enable-gd-jis-conv" + ]; + enable = lib.versionAtLeast php.version "7.4"; } + { name = "gd"; + buildInputs = [ zlib gd libXpm ]; + configureFlags = [ + "--with-gd=${gd.dev}" + "--with-freetype-dir=${freetype.dev}" + "--with-jpeg-dir=${libjpeg.dev}" + "--with-png-dir=${libpng.dev}" + "--with-webp-dir=${libwebp}" + "--with-xpm-dir=${libXpm.dev}" + "--with-zlib-dir=${zlib.dev}" + "--enable-gd-jis-conv" + ]; + enable = lib.versionOlder php.version "7.4"; } + ## gettext (7.2, 7.3, 7.4) -- configure: error: Cannot locate header file libintl.h + #{ name = "gettext"; + # buildInputs = [ gettext ]; + # configureFlags = "--with-gettext=${gettext}"; } + { name = "gmp"; + buildInputs = [ gmp5 ]; + configureFlags = [ "--with-gmp=${gmp5.dev}" ]; + # gmp5 doesn't build on darwin. + enable = (!stdenv.isDarwin); } + { name = "hash"; enable = lib.versionOlder php.version "7.4"; } + { name = "iconv"; configureFlags = if stdenv.isDarwin then + [ "--with-iconv=${libiconv}" ] + else + [ "--with-iconv" ]; } + { name = "imap"; + buildInputs = [ uwimap openssl pam pcre' ]; + configureFlags = [ "--with-imap=${uwimap}" "--with-imap-ssl" ]; + # uwimap doesn't build on darwin. + enable = (!stdenv.isDarwin); } + # interbase (7.3, 7.2) + { name = "intl"; buildInputs = [ icu ]; } + { name = "json"; } + { name = "ldap"; + buildInputs = [ openldap cyrus_sasl ]; + configureFlags = [ + "--with-ldap" + "LDAP_DIR=${openldap.dev}" + "LDAP_INCDIR=${openldap.dev}/include" + "LDAP_LIBDIR=${openldap.out}/lib" + ] ++ lib.optional stdenv.isLinux "--with-ldap-sasl=${cyrus_sasl.dev}"; } + { name = "mbstring"; buildInputs = [ oniguruma ]; } + { name = "mysqli"; configureFlags = [ "--with-mysqli=mysqlnd" "--with-mysql-sock=/run/mysqld/mysqld.sock" ]; } + # oci8 (7.4, 7.3, 7.2) + # odbc (7.4, 7.3, 7.2) + { name = "opcache"; buildInputs = [ pcre' ]; } + { name = "pcntl"; } + { name = "pdo"; } + { name = "pdo_dblib"; + configureFlags = [ "--with-pdo-dblib=${freetds}" ]; + # Doesn't seem to work on darwin. + enable = (!stdenv.isDarwin); } + # pdo_firebird (7.4, 7.3, 7.2) + { name = "pdo_mysql"; configureFlags = [ "--with-pdo-mysql=mysqlnd" ]; } + # pdo_oci (7.4, 7.3, 7.2) + # pdo_odbc (7.4, 7.3, 7.2) + { name = "pdo_pgsql"; configureFlags = [ "--with-pdo-pgsql=${postgresql}" ]; } + { name = "pdo_sqlite"; buildInputs = [ sqlite ]; configureFlags = [ "--with-pdo-sqlite=${sqlite.dev}" ]; } + { name = "pgsql"; buildInputs = [ pcre' ]; configureFlags = [ "--with-pgsql=${postgresql}" ]; } + { name = "phar"; buildInputs = [ pcre' openssl ]; } + { name = "posix"; } + { name = "pspell"; configureFlags = [ "--with-pspell=${aspell}" ]; } + ## readline (7.4, 7.3, 7.2) -- configure: error: Please reinstall libedit - I cannot find readline.h + #{ name = "readline"; + # buildInputs = [ libedit readline ]; + # configureFlags = [ "--with-readline=${readline.dev}" ]; } + { name = "recode"; + configureFlags = [ "--with-recode=${recode}" ]; + # Removed in php 7.4. + enable = lib.versionOlder php.version "7.4"; } + { name = "session"; } + { name = "shmop"; } + { name = "simplexml"; + buildInputs = [ libxml2 pcre' ]; + configureFlags = [ "--enable-simplexml" ] + # Required to build on darwin. + ++ lib.optional (lib.versionOlder php.version "7.4") [ "--with-libxml-dir=${libxml2.dev}" ]; } + { name = "snmp"; + buildInputs = [ net-snmp openssl ]; + configureFlags = [ "--with-snmp" ]; + # net-snmp doesn't build on darwin. + enable = (!stdenv.isDarwin); } + { name = "soap"; + buildInputs = [ libxml2 ]; + configureFlags = [ "--enable-soap" ] + # Required to build on darwin. + ++ lib.optional (lib.versionOlder php.version "7.4") [ "--with-libxml-dir=${libxml2.dev}" ]; } + { name = "sockets"; } + { name = "sodium"; buildInputs = [ libsodium ]; } + { name = "sysvmsg"; } + { name = "sysvsem"; } + { name = "sysvshm"; } + { name = "tidy"; configureFlags = [ "--with-tidy=${html-tidy}" ]; } + { name = "tokenizer"; } + { name = "wddx"; + buildInputs = [ libxml2 ]; + configureFlags = [ "--enable-wddx" "--with-libxml-dir=${libxml2.dev}" ]; + # Removed in php 7.4. + enable = lib.versionOlder php.version "7.4"; } + { name = "xml"; + buildInputs = [ libxml2 ]; + configureFlags = [ "--enable-xml" ] + # Required to build on darwin. + ++ lib.optional (lib.versionOlder php.version "7.4") [ "--with-libxml-dir=${libxml2.dev}" ]; } + { name = "xmlreader"; + buildInputs = [ libxml2 ]; + configureFlags = [ "--enable-xmlreader CFLAGS=-I../.." ] + # Required to build on darwin. + ++ lib.optional (lib.versionOlder php.version "7.4") [ "--with-libxml-dir=${libxml2.dev}" ]; } + { name = "xmlrpc"; + buildInputs = [ libxml2 libiconv ]; + configureFlags = [ "--with-xmlrpc" ] + # Required to build on darwin. + ++ lib.optional (lib.versionOlder php.version "7.4") [ "--with-libxml-dir=${libxml2.dev}" ]; } + { name = "xmlwriter"; + buildInputs = [ libxml2 ]; + configureFlags = [ "--enable-xmlwriter" ] + # Required to build on darwin. + ++ lib.optional (lib.versionOlder php.version "7.4") [ "--with-libxml-dir=${libxml2.dev}" ]; } + { name = "xsl"; buildInputs = [ libxslt libxml2 ]; configureFlags = [ "--with-xsl=${libxslt.dev}" ]; } + { name = "zend_test"; } + { name = "zip"; buildInputs = [ libzip pcre' ]; + configureFlags = [ "--with-zip" ] + ++ lib.optional (lib.versionOlder php.version "7.4") [ "--with-zlib-dir=${zlib.dev}" ] + ++ lib.optional (lib.versionOlder php.version "7.3") [ "--with-libzip" ]; } ]; # Convert the list of attrs: -- cgit 1.4.1