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

[24.05] php: 8.1.30 -> 8.1.31, 8.2.24 -> 8.2.26, 8.3.13 -> 8.3.14 #358797

Merged
merged 4 commits into from
Nov 24, 2024
Merged

[24.05] php: 8.1.30 -> 8.1.31, 8.2.24 -> 8.2.26, 8.3.13 -> 8.3.14 #358797

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2268d12
apacheHttpdPackages.php: 8.2.24 -> 8.2.25
r-ryantm Oct 27, 2024
24310d1
php82: 8.2.25 -> 8.2.26
r-ryantm Nov 24, 2024
4ba1283
php83: 8.3.13 -> 8.3.14
Ma27 Nov 24, 2024
714f870
php81: 8.1.30 -> 8.1.31
Ma27 Nov 24, 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
12 changes: 2 additions & 10 deletions pkgs/development/interpreters/php/8.1.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,8 @@

let
base = callPackage ./generic.nix ((removeAttrs _args [ "fetchpatch" ]) // {
version = "8.1.30";
hash = "sha256-yxYl5axJuRA3R34+d2e7BiQ0OXGuuZL0eRthivVx0j4=";
extraPatches = [
# Fix build with libxml 2.12+.
# Patch from https://github.com/php/php-src/commit/0a39890c967aa57225bb6bdf4821aff7a3a3c082
(fetchpatch {
url = "https://github.com/php/php-src/commit/0a39890c967aa57225bb6bdf4821aff7a3a3c082.patch";
hash = "sha256-HvpTL7aXO9gr4glFdhqUWQPrG8TYTlvbNINq33M3zS0=";
})
];
version = "8.1.31";
hash = "sha256-CzmCizRRUcrxt5XZ9LkjyYhyMXdsMwdt/J2QpEOQ0Nw=";
});
in
base.withExtensions ({ all, ... }: with all; ([
Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/interpreters/php/8.2.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

let
base = callPackage ./generic.nix (_args // {
version = "8.2.24";
hash = "sha256-TMduxkTu6X0XySv+jQ6EcU/t8pmlOLffrcBjndDcQy8=";
version = "8.2.26";
hash = "sha256-vlfDR9RRyQW8tDNoMqhk2ZKN0OIJibhycF/qC6ZHbGs=";
});
in
base.withExtensions ({ all, ... }: with all; ([
Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/interpreters/php/8.3.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

let
base = callPackage ./generic.nix (_args // {
version = "8.3.13";
hash = "sha256-x3kcguGlVMyvhKQLpxzBQXupr2f7Wzl4CDf9fH628SQ=";
version = "8.3.14";
hash = "sha256-9W+mac5MAUUqKSH0ADTXedjCuX0HSUk61HgYE7kiHPg=";
});
in
base.withExtensions ({ all, ... }: with all; ([
Expand Down
12 changes: 0 additions & 12 deletions pkgs/top-level/php-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -382,18 +382,6 @@ in {
configureFlags = [
"--enable-dom"
];
# Add a PHP lower version bound constraint to avoid applying the patch on older PHP versions.
patches = lib.optionals ((lib.versions.majorMinor php.version == "8.2" && lib.versionOlder php.version "8.2.14" && lib.versionAtLeast php.version "8.2.7") || (lib.versions.majorMinor php.version == "8.1" && lib.versionAtLeast php.version "8.1.27")) [
# Fix tests with libxml 2.12
# Part of 8.3.1RC1+, 8.2.14RC1+
(fetchpatch {
url = "https://github.com/php/php-src/commit/061058a9b1bbd90d27d97d79aebcf2b5029767b0.patch";
hash = "sha256-0hOlAG+pOYp/gUU0MUMZvzWpgr0ncJi5GB8IeNxxyEU=";
excludes = [
"NEWS"
];
})
];
}
{
name = "enchant";
Expand Down
Loading