JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #114592 from etu/php-minor-fixes

Browse Source 
php: various fixes
This commit is contained in:
Kim Lindberger 2021-03-02 09:41:15 +01:00 committed by GitHub
commit 8eea5d0fbd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 36 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nixos/modules/services/web-servers/apache-httpd/default.nix
View File

@ -22,7 +22,9 @@ let
php = cfg.phpPackage.override { apacheHttpd = pkg; };
phpMajorVersion = lib.versions.major (lib.getVersion php);
phpModuleName = let
majorVersion = lib.versions.major (lib.getVersion php);
in (if majorVersion == "8" then "php" else "php${majorVersion}");
mod_perl = pkgs.apacheHttpdPackages.mod_perl.override { apacheHttpd = pkg; };
@ -63,7 +65,7 @@ let
++ optional enableSSL "ssl"
++ optional enableUserDir "userdir"
++ optional cfg.enableMellon { name = "auth_mellon"; path = "${pkgs.apacheHttpdPackages.mod_auth_mellon}/modules/mod_auth_mellon.so"; }
++ optional cfg.enablePHP { name = "php${phpMajorVersion}"; path = "${php}/modules/libphp${phpMajorVersion}.so"; }
++ optional cfg.enablePHP { name = phpModuleName; path = "${php}/modules/lib${phpModuleName}.so"; }
++ optional cfg.enablePerl { name = "perl"; path = "${mod_perl}/modules/mod_perl.so"; }
++ cfg.extraModules;

3
nixos/tests/all-tests.nix
View File

@ -307,6 +307,9 @@ in
pgjwt = handleTest ./pgjwt.nix {};
pgmanage = handleTest ./pgmanage.nix {};
php = handleTest ./php {};
php73 = handleTest ./php { php = pkgs.php73; };
php74 = handleTest ./php { php = pkgs.php74; };
php80 = handleTest ./php { php = pkgs.php80; };
pinnwand = handleTest ./pinnwand.nix {};
plasma5 = handleTest ./plasma5.nix {};
pleroma = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./pleroma.nix {};

13
nixos/tests/php/default.nix
View File

@ -1,8 +1,9 @@
{ system ? builtins.currentSystem,
config ? {},
pkgs ? import ../../.. { inherit system config; }
{ system ? builtins.currentSystem
, config ? {}
, pkgs ? import ../../.. { inherit system config; }
, php ? pkgs.php
}: {
fpm = import ./fpm.nix { inherit system pkgs; };
httpd = import ./httpd.nix { inherit system pkgs; };
pcre = import ./pcre.nix { inherit system pkgs; };
fpm = import ./fpm.nix { inherit system pkgs php; };
httpd = import ./httpd.nix { inherit system pkgs php; };
pcre = import ./pcre.nix { inherit system pkgs php; };
}

7
nixos/tests/php/fpm.nix
View File

@ -1,5 +1,5 @@
import ../make-test-python.nix ({pkgs, lib, ...}: {
name = "php-fpm-nginx-test";
import ../make-test-python.nix ({pkgs, lib, php, ...}: {
name = "php-${php.version}-fpm-nginx-test";
meta.maintainers = lib.teams.php.members;
machine = { config, lib, pkgs, ... }: {
@ -25,6 +25,7 @@ import ../make-test-python.nix ({pkgs, lib, ...}: {
services.phpfpm.pools."foobar" = {
user = "nginx";
phpPackage = php;
settings = {
"listen.group" = "nginx";
"listen.mode" = "0600";
@ -44,7 +45,7 @@ import ../make-test-python.nix ({pkgs, lib, ...}: {
# Check so we get an evaluated PHP back
response = machine.succeed("curl -fvvv -s http://127.0.0.1:80/")
assert "PHP Version ${pkgs.php.version}" in response, "PHP version not detected"
assert "PHP Version ${php.version}" in response, "PHP version not detected"
# Check so we have database and some other extensions loaded
for ext in ["json", "opcache", "pdo_mysql", "pdo_pgsql", "pdo_sqlite"]:

7
nixos/tests/php/httpd.nix
View File

@ -1,5 +1,5 @@
import ../make-test-python.nix ({pkgs, lib, ...}: {
name = "php-httpd-test";
import ../make-test-python.nix ({pkgs, lib, php, ...}: {
name = "php-${php.version}-httpd-test";
meta.maintainers = lib.teams.php.members;
machine = { config, lib, pkgs, ... }: {
@ -14,6 +14,7 @@ import ../make-test-python.nix ({pkgs, lib, ...}: {
index = "index.php index.html";
};
};
phpPackage = php;
enablePHP = true;
};
};
@ -22,7 +23,7 @@ import ../make-test-python.nix ({pkgs, lib, ...}: {
# Check so we get an evaluated PHP back
response = machine.succeed("curl -fvvv -s http://127.0.0.1:80/")
assert "PHP Version ${pkgs.php.version}" in response, "PHP version not detected"
assert "PHP Version ${php.version}" in response, "PHP version not detected"
# Check so we have database and some other extensions loaded
for ext in ["json", "opcache", "pdo_mysql", "pdo_pgsql", "pdo_sqlite"]:

5
nixos/tests/php/pcre.nix
View File

@ -1,7 +1,7 @@
let
testString = "can-use-subgroups";
in import ../make-test-python.nix ({lib, ...}: {
name = "php-httpd-pcre-jit-test";
in import ../make-test-python.nix ({lib, php, ...}: {
name = "php-${php.version}-httpd-pcre-jit-test";
meta.maintainers = lib.teams.php.members;
machine = { lib, pkgs, ... }: {
@ -9,6 +9,7 @@ in import ../make-test-python.nix ({lib, ...}: {
services.httpd = {
enable = true;
adminAddr = "please@dont.contact";
phpPackage = php;
enablePHP = true;
phpOptions = "pcre.jit = true";
extraConfig = let

4
pkgs/build-support/build-pecl.nix
View File

@ -16,10 +16,10 @@
}@args:
stdenv.mkDerivation (args // {
name = "php-${pname}-${version}";
pname = "php-${php.version}-${pname}";
extensionName = pname;
inherit src;
inherit version src;
nativeBuildInputs = [ autoreconfHook re2c ] ++ nativeBuildInputs;
buildInputs = [ php ] ++ peclDeps ++ buildInputs;

9
pkgs/development/interpreters/php/generic.nix
View File

@ -5,7 +5,7 @@
let
generic =
{ callPackage, lib, stdenv, nixosTests, config, fetchurl, makeWrapper
{ callPackage, lib, stdenv, nixosTests, fetchurl, makeWrapper
, symlinkJoin, writeText, autoconf, automake, bison, flex, libtool
, pkg-config, re2c, apacheHttpd, libargon2, libxml2, pcre, pcre2
, systemd, system-sendmail, valgrind, xcbuild
@ -97,7 +97,7 @@ let
(enabledExtensions ++ (getDepsRecursively enabledExtensions)));
extNames = map getExtName enabledExtensions;
extraInit = writeText "php.ini" ''
extraInit = writeText "php-extra-init-${version}.ini" ''
${lib.concatStringsSep "\n"
(lib.textClosureList extensionTexts extNames)}
${extraConfig}
@ -112,7 +112,8 @@ let
withExtensions = mkWithExtensions allArgs allExtensionFunctions;
phpIni = "${phpWithExtensions}/lib/php.ini";
unwrapped = php;
tests = nixosTests.php;
# Select the right php tests for the php version
tests = nixosTests."php${lib.strings.replaceStrings [ "." ] [ "" ] (lib.versions.majorMinor php.version)}";
inherit (php-packages) extensions buildPecl;
packages = php-packages.tools;
meta = php.meta // {
@ -121,7 +122,7 @@ let
};
paths = [ php ];
postBuild = ''
cp ${extraInit} $out/lib/php.ini
ln -s ${extraInit} $out/lib/php.ini
wrapProgram $out/bin/php --set PHP_INI_SCAN_DIR $out/lib

5
pkgs/top-level/all-packages.nix
View File

@ -11389,9 +11389,10 @@ in
#
# Set default PHP interpreter, extensions and packages
php = php74;
phpExtensions = php74Extensions;
phpPackages = php74Packages;
phpExtensions = php.extensions;
phpPackages = php.packages;
# Import PHP80 interpreter, extensions and packages
php80 = callPackage ../development/interpreters/php/8.0.nix {
stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv;
};

2
pkgs/top-level/php-packages.nix
View File

@ -16,7 +16,7 @@ lib.makeScope pkgs.newScope (self: with self; {
# Wrap mkDerivation to prepend pname with "php-" to make names consistent
# with how buildPecl does it and make the file easier to overview.
mkDerivation = { pname, ... }@args: pkgs.stdenv.mkDerivation (args // {
pname = "php-${pname}";
pname = "php-${php.version}-${pname}";
});
pcre' = if (lib.versionAtLeast php.version "7.3") then pcre2 else pcre;