Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[staging-next] PHP 8.2 and 8.3 fixes for libxml2 2.13 #330299

Merged
merged 6 commits into from
Jul 28, 2024
Merged

[staging-next] PHP 8.2 and 8.3 fixes for libxml2 2.13 #330299

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d2c6d36
php{82,83}Extensions.dom: apply upstream patch for libxml2 2.13 compa…
reckenrode Jul 26, 2024
ff6f05d
php{83,83}Extensions.simplexml: apply upstream patch for libxml2 2.13…
reckenrode Jul 26, 2024
ae17cd6
php{83,83}Extensions.soap: apply upstream patch for libxml2 2.13 comp…
reckenrode Jul 26, 2024
99c8b83
php{83,83}Extensions.xml: apply upstream patch for libxml2 2.13 compa…
reckenrode Jul 26, 2024
30a6f25
php{83,83}Extensions.xmlwriter: apply upstream patch for libxml2 2.13…
reckenrode Jul 26, 2024
313ac78
phpExtensions.soap: back to doCheck = false (except on Darwin)
vcunat Jul 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
66 changes: 65 additions & 1 deletion pkgs/top-level/php-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -393,6 +393,18 @@ in {
"NEWS"
];
})
] ++ lib.optionals (lib.versions.majorMinor php.version == "8.2" && lib.versionOlder php.version "8.2.22") [
# Fixes compatibility with libxml2 2.13. Part of 8.3.10RC1+, 8.2.22RC1+
(fetchpatch {
url = "https://github.com/php/php-src/commit/4fe821311cafb18ca8bdf20b9d796c48a13ba552.diff?full_index=1";
hash = "sha256-YC3I0BQi3o3+VmRu/UqpqPpaSC+ekPqzbORTHftbPvY=";
})
] ++ lib.optionals (lib.versions.majorMinor php.version == "8.3" && lib.versionOlder php.version "8.3.10") [
(fetchpatch {
url = "https://github.com/php/php-src/commit/ecf0bb0fd12132d853969c5e9a212e5f627f2da2.diff?full_index=1";
hash = "sha256-sodGODHb4l04P0srn3L8l3K+DjZzCsCNbamfkmIyF+k=";
excludes = [ "NEWS" ];
})
];
}
{
Expand Down Expand Up @@ -605,6 +617,19 @@ in {
configureFlags = [
"--enable-simplexml"
];
patches = lib.optionals (lib.versions.majorMinor php.version == "8.2" && lib.versionOlder php.version "8.2.22") [
# Fixes compatibility with libxml2 2.13. Part of 8.3.10RC1+, 8.2.22RC1+
(fetchpatch {
url = "https://github.com/php/php-src/commit/4fe821311cafb18ca8bdf20b9d796c48a13ba552.diff?full_index=1";
hash = "sha256-YC3I0BQi3o3+VmRu/UqpqPpaSC+ekPqzbORTHftbPvY=";
})
] ++ lib.optionals (lib.versions.majorMinor php.version == "8.3" && lib.versionOlder php.version "8.3.10") [
(fetchpatch {
url = "https://github.com/php/php-src/commit/ecf0bb0fd12132d853969c5e9a212e5f627f2da2.diff?full_index=1";
hash = "sha256-sodGODHb4l04P0srn3L8l3K+DjZzCsCNbamfkmIyF+k=";
excludes = [ "NEWS" ];
})
];
}
{
name = "snmp";
Expand All @@ -620,8 +645,21 @@ in {
configureFlags = [
"--enable-soap"
];
doCheck = false;
doCheck = stdenv.isDarwin; # TODO: a couple tests still fail on *-linux
internalDeps = [ php.extensions.session ];
patches = lib.optionals (lib.versions.majorMinor php.version == "8.2" && lib.versionOlder php.version "8.2.22") [
# Fixes compatibility with libxml2 2.13. Part of 8.3.10RC1+, 8.2.22RC1+
(fetchpatch {
url = "https://github.com/php/php-src/commit/4fe821311cafb18ca8bdf20b9d796c48a13ba552.diff?full_index=1";
hash = "sha256-YC3I0BQi3o3+VmRu/UqpqPpaSC+ekPqzbORTHftbPvY=";
})
] ++ lib.optionals (lib.versions.majorMinor php.version == "8.3" && lib.versionOlder php.version "8.3.10") [
(fetchpatch {
url = "https://github.com/php/php-src/commit/ecf0bb0fd12132d853969c5e9a212e5f627f2da2.diff?full_index=1";
hash = "sha256-sodGODHb4l04P0srn3L8l3K+DjZzCsCNbamfkmIyF+k=";
excludes = [ "NEWS" ];
})
];
}
{
name = "sockets";
Expand Down Expand Up @@ -654,6 +692,19 @@ in {
"--enable-xml"
];
doCheck = false;
patches = lib.optionals (lib.versions.majorMinor php.version == "8.2" && lib.versionOlder php.version "8.2.22") [
# Fixes compatibility with libxml2 2.13. Part of 8.3.10RC1+, 8.2.22RC1+
(fetchpatch {
url = "https://github.com/php/php-src/commit/4fe821311cafb18ca8bdf20b9d796c48a13ba552.diff?full_index=1";
hash = "sha256-YC3I0BQi3o3+VmRu/UqpqPpaSC+ekPqzbORTHftbPvY=";
})
] ++ lib.optionals (lib.versions.majorMinor php.version == "8.3" && lib.versionOlder php.version "8.3.10") [
(fetchpatch {
url = "https://github.com/php/php-src/commit/ecf0bb0fd12132d853969c5e9a212e5f627f2da2.diff?full_index=1";
hash = "sha256-sodGODHb4l04P0srn3L8l3K+DjZzCsCNbamfkmIyF+k=";
excludes = [ "NEWS" ];
})
];
}
{
name = "xmlreader";
Expand All @@ -671,6 +722,19 @@ in {
configureFlags = [
"--enable-xmlwriter"
];
patches = lib.optionals (lib.versions.majorMinor php.version == "8.2" && lib.versionOlder php.version "8.2.22") [
# Fixes compatibility with libxml2 2.13. Part of 8.3.10RC1+, 8.2.22RC1+
(fetchpatch {
url = "https://github.com/php/php-src/commit/4fe821311cafb18ca8bdf20b9d796c48a13ba552.diff?full_index=1";
hash = "sha256-YC3I0BQi3o3+VmRu/UqpqPpaSC+ekPqzbORTHftbPvY=";
})
] ++ lib.optionals (lib.versions.majorMinor php.version == "8.3" && lib.versionOlder php.version "8.3.10") [
(fetchpatch {
url = "https://github.com/php/php-src/commit/ecf0bb0fd12132d853969c5e9a212e5f627f2da2.diff?full_index=1";
hash = "sha256-sodGODHb4l04P0srn3L8l3K+DjZzCsCNbamfkmIyF+k=";
excludes = [ "NEWS" ];
})
];
}
{
name = "xsl";
Expand Down