diff --git a/nixos/doc/manual/release-notes/rl-1412.xml b/nixos/doc/manual/release-notes/rl-1412.xml index b81d8dc5453..35115f900c1 100644 --- a/nixos/doc/manual/release-notes/rl-1412.xml +++ b/nixos/doc/manual/release-notes/rl-1412.xml @@ -24,6 +24,11 @@ services.httpd.package = pkgs.apacheHttpd_2_2; + PHP 5.3 has been removed because it is no longer + supported by the PHP project. A migration guide is + available. + The host side of a container virtual Ethernet pair is now called ve-container-name rather than c-container-name. diff --git a/pkgs/development/interpreters/php/5.3-freetype-dirs.patch b/pkgs/development/interpreters/php/5.3-freetype-dirs.patch deleted file mode 100644 index 3b78f9b309b..00000000000 --- a/pkgs/development/interpreters/php/5.3-freetype-dirs.patch +++ /dev/null @@ -1,64 +0,0 @@ -From a0955f351c7eb1022da7ae36970ffef3b00c8aff Mon Sep 17 00:00:00 2001 -From: Adam Harvey -Date: Sat, 7 Dec 2013 19:39:40 -0800 -Subject: [PATCH] Switch to using freetype-config for freetype detection. - -This fixes GD compilation against libfreetype 2.5.1 and later after they made -the rather interesting decision to change their include directory layout in a -point release. - -The original suggestion in the bug was to use pkg-config, but my inclination is -to use freetype-config instead: we should be able to get the same configuration -information without actually needing pkg-config installed, since pkg-config is -by no means guaranteed to exist on many Unices and distros, whereas -freetype-config should always be present if a libfreetype build environment is -installed. Let's try it out and see what happens. - -Fixes bug #64405 (Use freetype-config for determining freetype2 dir(s)). - -diff --git a/ext/gd/config.m4 b/ext/gd/config.m4 -index 0e35ece..732e14c 100644 ---- a/ext/gd/config.m4 -+++ b/ext/gd/config.m4 -@@ -193,30 +193,25 @@ AC_DEFUN([PHP_GD_FREETYPE2],[ - if test "$PHP_FREETYPE_DIR" != "no"; then - - for i in $PHP_FREETYPE_DIR /usr/local /usr; do -- if test -f "$i/include/freetype2/freetype/freetype.h"; then -+ if test -f "$i/bin/freetype-config"; then - FREETYPE2_DIR=$i -- FREETYPE2_INC_DIR=$i/include/freetype2 -+ FREETYPE2_CONFIG="$i/bin/freetype-config" - break - fi - done - - if test -z "$FREETYPE2_DIR"; then -- AC_MSG_ERROR([freetype.h not found.]) -+ AC_MSG_ERROR([freetype-config not found.]) - fi - -- PHP_CHECK_LIBRARY(freetype, FT_New_Face, -- [ -- PHP_ADD_LIBRARY_WITH_PATH(freetype, $FREETYPE2_DIR/$PHP_LIBDIR, GD_SHARED_LIBADD) -- PHP_ADD_INCLUDE($FREETYPE2_DIR/include) -- PHP_ADD_INCLUDE($FREETYPE2_INC_DIR) -- AC_DEFINE(USE_GD_IMGSTRTTF, 1, [ ]) -- AC_DEFINE(HAVE_LIBFREETYPE,1,[ ]) -- AC_DEFINE(ENABLE_GD_TTF,1,[ ]) -- ],[ -- AC_MSG_ERROR([Problem with freetype.(a|so). Please check config.log for more information.]) -- ],[ -- -L$FREETYPE2_DIR/$PHP_LIBDIR -- ]) -+ FREETYPE2_CFLAGS=`$FREETYPE2_CONFIG --cflags` -+ FREETYPE2_LIBS=`$FREETYPE2_CONFIG --libs` -+ -+ PHP_EVAL_INCLINE($FREETYPE2_CFLAGS) -+ PHP_EVAL_LIBLINE($FREETYPE2_LIBS, GD_SHARED_LIBADD) -+ AC_DEFINE(USE_GD_IMGSTRTTF, 1, [ ]) -+ AC_DEFINE(HAVE_LIBFREETYPE,1,[ ]) -+ AC_DEFINE(ENABLE_GD_TTF,1,[ ]) - else - AC_MSG_RESULT([If configure fails try --with-freetype-dir=]) - fi diff --git a/pkgs/development/interpreters/php/5.3.nix b/pkgs/development/interpreters/php/5.3.nix deleted file mode 100644 index 4de87f20d8e..00000000000 --- a/pkgs/development/interpreters/php/5.3.nix +++ /dev/null @@ -1,245 +0,0 @@ -{ stdenv, fetchurl, composableDerivation, autoconf, automake, flex, bison -, apacheHttpd, mysql, libxml2, readline, zlib, curl, gd, postgresql, gettext -, openssl, pkgconfig, sqlite, config, libjpeg, libpng, freetype, libxslt -, libmcrypt, bzip2, icu, libssh2, makeWrapper, libiconvOrEmpty, libiconv, uwimap -, pam }: - -let - libmcryptOverride = libmcrypt.override { disablePosixThreads = true; }; -in - -composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) version; in { - - version = "5.3.29"; - - name = "php-${version}"; - - enableParallelBuilding = true; - - buildInputs - = [ flex bison pkgconfig ] - ++ stdenv.lib.optionals stdenv.isDarwin [ libssh2 makeWrapper ]; - - # need to include the C++ standard library when compiling on darwin - NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lstdc++"; - - # need to specify where the dylib for icu is stored - DYLD_LIBRARY_PATH = stdenv.lib.optionalString stdenv.isDarwin "${icu}/lib"; - - flags = { - - # much left to do here... - - # SAPI modules: - - apxs2 = { - configureFlags = ["--with-apxs2=${apacheHttpd}/bin/apxs"]; - buildInputs = [apacheHttpd]; - }; - - # Extensions - - curl = { - configureFlags = ["--with-curl=${curl}" "--with-curlwrappers"]; - buildInputs = [curl openssl]; - }; - - pcntl = { - configureFlags = [ "--enable-pcntl" ]; - }; - - zlib = { - configureFlags = ["--with-zlib=${zlib}"]; - buildInputs = [zlib]; - }; - - libxml2 = { - configureFlags - = [ "--with-libxml-dir=${libxml2}" ] - ++ stdenv.lib.optional (libiconvOrEmpty != []) - [ "--with-iconv=${libiconv}" ]; - buildInputs = [ libxml2 ] ++ libiconvOrEmpty; - }; - - readline = { - configureFlags = ["--with-readline=${readline}"]; - buildInputs = [ readline ]; - }; - - sqlite = { - configureFlags = ["--with-pdo-sqlite=${sqlite}"]; - buildInputs = [ sqlite ]; - }; - - postgresql = { - configureFlags = ["--with-pgsql=${postgresql}"]; - buildInputs = [ postgresql ]; - }; - - mysql = { - configureFlags = ["--with-mysql=${mysql}"]; - buildInputs = [ mysql ]; - }; - - mysqli = { - configureFlags = ["--with-mysqli=${mysql}/bin/mysql_config"]; - buildInputs = [ mysql]; - }; - - mysqli_embedded = { - configureFlags = ["--enable-embedded-mysqli"]; - depends = "mysqli"; - assertion = fixed.mysqliSupport; - }; - - pdo_mysql = { - configureFlags = ["--with-pdo-mysql=${mysql}"]; - buildInputs = [ mysql ]; - }; - - bcmath = { - configureFlags = ["--enable-bcmath"]; - }; - - gd = { - configureFlags = [ - "--with-gd=${gd}" - "--with-png-dir=${libpng}" - "--with-jpeg-dir=${libjpeg}" - ]; - buildInputs = [gd libpng libjpeg freetype]; - }; - - soap = { - configureFlags = ["--enable-soap"]; - }; - - sockets = { - configureFlags = ["--enable-sockets"]; - }; - - openssl = { - configureFlags = ["--with-openssl=${openssl}"]; - buildInputs = ["openssl"]; - }; - - mbstring = { - configureFlags = ["--enable-mbstring"]; - }; - - gettext = { - configureFlags = ["--with-gettext=${gettext}"]; - buildInputs = [gettext]; - }; - - imap = { - configureFlags = [ "--with-imap=${uwimap}" "--with-imap-ssl" ] - # uwimap builds with kerberos on darwin - ++ stdenv.lib.optional (stdenv.isDarwin) "--with-kerberos"; - buildInputs = [ uwimap openssl ] - ++ stdenv.lib.optional (!stdenv.isDarwin) pam; - }; - - intl = { - configureFlags = ["--enable-intl"]; - buildInputs = [icu]; - }; - - exif = { - configureFlags = ["--enable-exif"]; - }; - - xsl = { - configureFlags = ["--with-xsl=${libxslt}"]; - buildInputs = [libxslt]; - }; - - mcrypt = { - configureFlags = ["--with-mcrypt=${libmcrypt}"]; - buildInputs = [libmcryptOverride]; - }; - - bz2 = { - configureFlags = ["--with-bz2=${bzip2}"]; - buildInputs = [bzip2]; - }; - - zip = { - configureFlags = ["--enable-zip"]; - }; - - ftp = { - configureFlags = ["--enable-ftp"]; - }; - - fpm = { - configureFlags = ["--enable-fpm"]; - }; - }; - - cfg = { - apxs2Support = config.php.apxs2 or true; - bcmathSupport = config.php.bcmath or true; - bz2Support = config.php.bz2 or false; - curlSupport = config.php.curl or true; - exifSupport = config.php.exif or true; - ftpSupport = config.php.ftp or true; - fpmSupport = config.php.fpm or false; - gdSupport = config.php.gd or true; - gettextSupport = config.php.gettext or true; - imapSupport = config.php.imap or false; - intlSupport = config.php.intl or true; - libxml2Support = config.php.libxml2 or true; - mbstringSupport = config.php.mbstring or true; - mcryptSupport = config.php.mcrypt or false; - mysqlSupport = config.php.mysql or true; - mysqliSupport = config.php.mysqli or true; - opensslSupport = config.php.openssl or true; - pcntlSupport = config.php.pcntl or true; - pdo_mysqlSupport = config.php.pdo_mysql or true; - postgresqlSupport = config.php.postgresql or true; - readlineSupport = config.php.readline or true; - soapSupport = config.php.soap or true; - socketsSupport = config.php.sockets or true; - sqliteSupport = config.php.sqlite or true; - xslSupport = config.php.xsl or false; - zipSupport = config.php.zip or true; - zlibSupport = config.php.zlib or true; - }; - - configurePhase = '' - iniFile=$out/etc/php-recommended.ini - [[ -z "$libxml2" ]] || export PATH=$PATH:$libxml2/bin - ./configure --with-config-file-scan-dir=/etc --with-config-file-path=$out/etc --prefix=$out $configureFlags - echo configurePhase end - '' + stdenv.lib.optionalString stdenv.isDarwin '' - # don't build php.dSYM as the php binary - sed -i 's/EXEEXT = \.dSYM/EXEEXT =/' Makefile - ''; - - installPhase = '' - unset installPhase; installPhase; - cp php.ini-production $iniFile - '' + ( stdenv.lib.optionalString stdenv.isDarwin '' - for prog in $out/bin/*; do - wrapProgram "$prog" --prefix DYLD_LIBRARY_PATH : "$DYLD_LIBRARY_PATH" - done - '' ); - - src = fetchurl { - url = "http://www.php.net/distributions/php-${version}.tar.bz2"; - sha256 = "1480pfp4391byqzmvdmbxkdkqwdzhdylj63sfzrcgadjf9lwzqf4"; - name = "php-${version}.tar.bz2"; - }; - - meta = { - description = "An HTML-embedded scripting language"; - homepage = http://www.php.net/; - license = "PHP-3"; - maintainers = with stdenv.lib.maintainers; [ lovek323 ]; - platforms = stdenv.lib.platforms.unix; - }; - - patches = [ ./fix.patch ./5.3-freetype-dirs.patch ]; - -}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 751ccdde3e0..c266734e50c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4076,17 +4076,6 @@ let inherit php pkgs; }); - php53 = callPackage ../development/interpreters/php/5.3.nix { }; - - php_fpm53 = callPackage ../development/interpreters/php/5.3.nix { - config = config // { - php = (config.php or {}) // { - fpm = true; - apxs2 = false; - }; - }; - }; - php54 = callPackage ../development/interpreters/php/5.4.nix { }; picolisp = callPackage ../development/interpreters/picolisp {};