nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-10-03 13:30:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #147720 from NixOS/backport-146488-to-release-21.11

Browse Source 
[Backport release-21.11] php74: 7.4.25 -> 7.4.26, php80: 8.0.12 -> 8.0.13
This commit is contained in:
ajs124
2021-11-28 18:24:26 +01:00
committed by GitHub
parent f71736e772 36be1049b3
commit 0ccf2f5c94
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/interpreters/php/7.4.nix
View File

@@ -2,8 +2,8 @@
let
base = callPackage ./generic.nix (_args // {
version = "7.4.25";
sha256 = "sha256-J5klcMrz4uUyOrezeFPETBUpsdMeqU2Xdu+pHVp4ExM=";
version = "7.4.26";
sha256 = "0k803j5wf4jv72px0zqz2z2hxyk2w3jr6xyczy568dx4z2l8i2yn";
});
in

4
pkgs/development/interpreters/php/8.0.nix
View File

@@ -2,8 +2,8 @@
let
base = callPackage ./generic.nix (_args // {
version = "8.0.12";
sha256 = "sha256-tIhtsd8yLcj7Eo2LNK5+lPb8aC7LKf9PWlkdTen+rb8=";
version = "8.0.13";
sha256 = "0djqh650clz4fy1zifazf0jq383znksydx23f1s48prrlixrshf2";
});
in

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

@@ -563,6 +563,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}" ];