Merge pull request #147723 from helsinki-systems/bkp/21.05/php

[21.05] php74: 7.4.25 -> 7.4.26, php80: 8.0.12 -> 8.0.13
This commit is contained in:
Maximilian Bosch
2021-11-29 15:32:24 +01:00
committed by GitHub
3 changed files with 5 additions and 4 deletions

View File

@@ -5,8 +5,8 @@ let
base = callPackage generic (_args // {
version = "7.4.25";
sha256 = "sha256-J5klcMrz4uUyOrezeFPETBUpsdMeqU2Xdu+pHVp4ExM=";
version = "7.4.26";
sha256 = "0k803j5wf4jv72px0zqz2z2hxyk2w3jr6xyczy568dx4z2l8i2yn";
});
in base.withExtensions ({ all, ... }: with all; ([

View File

@@ -4,8 +4,8 @@ let
generic = (import ./generic.nix) _args;
base = callPackage generic (_args // {
version = "8.0.12";
sha256 = "sha256-tIhtsd8yLcj7Eo2LNK5+lPb8aC7LKf9PWlkdTen+rb8=";
version = "8.0.13";
sha256 = "0djqh650clz4fy1zifazf0jq383znksydx23f1s48prrlixrshf2";
});
in base.withExtensions ({ all, ... }: with all; ([

View File

@@ -535,6 +535,7 @@ lib.makeScope pkgs.newScope (self: with self; {
buildInputs = [ libxml2 ];
internalDeps = [ php.extensions.dom ];
NIX_CFLAGS_COMPILE = [ "-I../.." "-DHAVE_DOM" ];
doCheck = false;
configureFlags = [ "--enable-xmlreader" ]
# Required to build on darwin.
++ lib.optionals (lib.versionOlder php.version "7.4") [ "--with-libxml-dir=${libxml2.dev}" ]; }