Merge pull request #31526 from srhb/fix-php-external-pcre
php: Fix php pcre by using external lib
This commit is contained in:
commit
b62ad4f22b
@ -109,6 +109,7 @@ in rec {
|
||||
(all nixos.tests.nfs3)
|
||||
(all nixos.tests.nfs4)
|
||||
(all nixos.tests.openssh)
|
||||
(all nixos.tests.php-pcre)
|
||||
(all nixos.tests.printing)
|
||||
(all nixos.tests.proxy)
|
||||
(all nixos.tests.sddm.default)
|
||||
|
@ -40,6 +40,7 @@ in rec {
|
||||
nat
|
||||
nfs3
|
||||
openssh
|
||||
php-pcre
|
||||
proxy
|
||||
simple;
|
||||
installer = {
|
||||
|
@ -309,6 +309,7 @@ in rec {
|
||||
tests.pam-oath-login = callTest tests/pam-oath-login.nix {};
|
||||
#tests.panamax = hydraJob (import tests/panamax.nix { system = "x86_64-linux"; });
|
||||
tests.peerflix = callTest tests/peerflix.nix {};
|
||||
tests.php-pcre = callTest tests/php-pcre.nix {};
|
||||
tests.postgresql = callSubTests tests/postgresql.nix {};
|
||||
tests.pgmanage = callTest tests/pgmanage.nix {};
|
||||
tests.postgis = callTest tests/postgis.nix {};
|
||||
|
44
nixos/tests/php-pcre.nix
Normal file
44
nixos/tests/php-pcre.nix
Normal file
@ -0,0 +1,44 @@
|
||||
|
||||
let testString = "can-use-subgroups"; in
|
||||
|
||||
import ./make-test.nix ({ pkgs, ...}: {
|
||||
name = "php-httpd-pcre-jit-test";
|
||||
machine = { config, lib, pkgs, ... }: {
|
||||
time.timeZone = "UTC";
|
||||
services.httpd = {
|
||||
enable = true;
|
||||
adminAddr = "please@dont.contact";
|
||||
extraSubservices = lib.singleton {
|
||||
function = f: {
|
||||
enablePHP = true;
|
||||
phpOptions = "pcre.jit = true";
|
||||
|
||||
extraConfig =
|
||||
let
|
||||
testRoot = pkgs.writeText "index.php"
|
||||
''
|
||||
<?php
|
||||
preg_match('/(${testString})/', '${testString}', $result);
|
||||
var_dump($result);
|
||||
?>
|
||||
'';
|
||||
in
|
||||
''
|
||||
Alias / ${testRoot}/
|
||||
|
||||
<Directory ${testRoot}>
|
||||
Require all granted
|
||||
</Directory>
|
||||
'';
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
testScript = { nodes, ... }:
|
||||
''
|
||||
$machine->waitForUnit('httpd.service');
|
||||
# Ensure php evaluation by matching on the var_dump syntax
|
||||
$machine->succeed('curl -vvv -s http://127.0.0.1:80/index.php \
|
||||
| grep "string(${toString (builtins.stringLength testString)}) \"${testString}\""');
|
||||
'';
|
||||
})
|
@ -1,6 +1,8 @@
|
||||
# pcre functionality is tested in nixos/tests/php-pcre.nix
|
||||
|
||||
{ lib, stdenv, fetchurl, composableDerivation, autoconf, automake, flex, bison
|
||||
, mysql, libxml2, readline, zlib, curl, postgresql, gettext
|
||||
, openssl, pkgconfig, sqlite, config, libjpeg, libpng, freetype
|
||||
, openssl, pcre, pkgconfig, sqlite, config, libjpeg, libpng, freetype
|
||||
, libxslt, libmcrypt, bzip2, icu, openldap, cyrus_sasl, libmhash, freetds
|
||||
, uwimap, pam, gmp, apacheHttpd, libiconv, systemd }:
|
||||
|
||||
@ -23,7 +25,7 @@ let
|
||||
enableParallelBuilding = true;
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
buildInputs = [ flex bison ]
|
||||
buildInputs = [ flex bison pcre ]
|
||||
++ lib.optional stdenv.isLinux systemd;
|
||||
|
||||
CXXFLAGS = lib.optional stdenv.cc.isClang "-std=c++11";
|
||||
@ -287,6 +289,7 @@ let
|
||||
|
||||
configureFlags = [
|
||||
"--with-config-file-scan-dir=/etc/php.d"
|
||||
"--with-pcre-regex=${pcre.dev} PCRE_LIBDIR=${pcre}"
|
||||
] ++ lib.optional stdenv.isDarwin "--with-iconv=${libiconv}"
|
||||
++ lib.optional stdenv.isLinux "--with-fpm-systemd";
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user