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

flake.lock: Update, xdebug 3.4.0, remove failing tests #382

Merged
merged 5 commits into from
Dec 1, 2024
Merged

flake.lock: Update, xdebug 3.4.0, remove failing tests #382

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e01eb30
flake.lock: Update
piotrkwiecinski Nov 30, 2024
4ce1611
php84.extensions.xdebug: use stable 3.4.0
piotrkwiecinski Nov 30, 2024
f157763
php7{1-3}.extension.soap: remove failing tests
piotrkwiecinski Nov 30, 2024
1383424
php81.extension.dom: apply libxml2 patch only for version below 8.1.31
piotrkwiecinski Nov 30, 2024
8410ed9
php84.extension.imagick: attempt to fix build
piotrkwiecinski Nov 30, 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
18 changes: 9 additions & 9 deletions flake.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

49 changes: 28 additions & 21 deletions pkgs/package-overrides.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,11 @@ in
# Patch rebased from https://github.com/php/php-src/commit/061058a9b1bbd90d27d97d79aebcf2b5029767b0
# Fix PHP tests with libxml2 2.12
./patches/php74-libxml212-tests.patch
] ++ lib.optionals (lib.versionAtLeast prev.php.version "8.1" && lib.versionOlder prev.php.version "8.2.14") [
] ++ lib.optionals (lib.versionAtLeast prev.php.version "8.2" && lib.versionOlder prev.php.version "8.2.14") [
# Patch rebased from https://github.com/php/php-src/commit/0a39890c967aa57225bb6bdf4821aff7a3a3c082
# Fix compilation errors with libxml2 2.12
./patches/libxml-ext.patch
] ++ lib.optionals (lib.versionAtLeast prev.php.version "8.1" && lib.versionOlder prev.php.version "8.1.31") [
# Patch rebased from https://github.com/php/php-src/commit/0a39890c967aa57225bb6bdf4821aff7a3a3c082
# Fix compilation errors with libxml2 2.12
./patches/libxml-ext.patch
Expand Down Expand Up @@ -345,6 +349,17 @@ in
ourPatches ++ upstreamPatches;
});

imagick = if lib.versionAtLeast prev.php.version "8.4" then
prev.extensions.imagick.overrideAttrs (attrs: {
patches = (attrs.patches or []) ++ [
(pkgs.fetchpatch {
url = "https://github.com/Imagick/imagick/commit/65e27f2bc02e7e8f1bf64e26e359e42a1331fca1.patch";
hash ="sha256-I0FwdqtQ/Y/QVkCl+nWPBIxsdQY6qcjdwiA/BaLNl7g=";
})
];
})
else prev.extensions.imagick;

imap =
if lib.versionOlder prev.php.version "8.1" && pkgs.stdenv.cc.isClang then
prev.extensions.imap.overrideAttrs (attrs: {
Expand Down Expand Up @@ -757,8 +772,17 @@ in
"--with-libxml-dir=${pkgs.libxml2.dev}"
];

# Tests fail on Darwin with older PHP versions for some reason.
doCheck = attrs.doCheck or true && (lib.versionOlder prev.php.version "7.4" -> pkgs.stdenv.isLinux);
# Tests fail on Darwin with older PHP versions for some reason.
doCheck = attrs.doCheck or true && (lib.versionOlder prev.php.version "7.4" -> pkgs.stdenv.isLinux);

postPatch =
attrs.postPatch or ""
+ lib.optionalString (lib.versionAtLeast prev.php.version "7.1" && lib.versionOlder prev.php.version "7.4") ''
rm ext/soap/tests/bugs/bug66112.phpt
''
+ lib.optionalString (lib.versionAtLeast prev.php.version "7.1" && lib.versionOlder prev.php.version "7.2") ''
rm ext/soap/tests/bugs/bug76348.phpt
'';
});


Expand Down Expand Up @@ -835,24 +859,7 @@ in

xdebug =
# xdebug versions were determined using https://xdebug.org/docs/compat
if lib.versionAtLeast prev.php.version "8.4" then
prev.extensions.xdebug.overrideAttrs (attrs: {
name = "xdebug-3.4.0alpha1";
version = "3.4.0alpha1";
src = pkgs.fetchurl {
url = "https://xdebug.org/files/xdebug-3.4.0alpha1.tgz";
hash = "sha256-S4oizwlhom50uV+ToV6ctdWka8d2CKnAPb2YmWOytOc=";
};

patches = [
# Fix missing ZEND_EXIT
(pkgs.fetchpatch {
url = "https://github.com/xdebug/xdebug/commit/6ecd35f898e67cbe7f9257e7cb3a4c602a3dc8ec.patch";
hash = "sha256-IYc1KKPBYek4AXEijoM9RaTwp51J0Gz/CQ1HgmTct3Q=";
})
];
})
else if lib.versionAtLeast prev.php.version "8.0" then
if lib.versionAtLeast prev.php.version "8.0" then
prev.extensions.xdebug
else if lib.versionAtLeast prev.php.version "7.2" then
prev.extensions.xdebug.overrideAttrs (attrs: {
Expand Down