Skip to content

Commit c1892a4

Browse files
jtojnardrupol
andcommitted
flake.lock: Update
Flake lock file updates: • Updated input 'flake-compat': 'github:edolstra/flake-compat/9100a0f413b0c601e0533d1d94ffd501ce2e7885' (2025-05-12) → 'github:edolstra/flake-compat/f387cd2afec9419c8ee37694406ca490c3f34ee5' (2025-10-27) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/3cbe716e2346710d6e1f7c559363d14e11c32a43' (2025-10-16) → 'github:NixOS/nixpkgs/85a6c4a07faa12aaccd81b36ba9bfc2bec974fa1' (2025-11-16) Co-authored-by: Pol Dellaiera <[email protected]>
1 parent 27fcbfa commit c1892a4

File tree

2 files changed

+23
-7
lines changed

2 files changed

+23
-7
lines changed

flake.lock

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkgs/package-overrides.nix

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,12 @@ in
124124
dom = prev.extensions.dom.overrideAttrs (attrs: {
125125
patches =
126126
let
127-
upstreamPatches = attrs.patches or [ ];
127+
upstreamPatches = builtins.filter (
128+
patch:
129+
# The patch does not apply on PHP < 8.2
130+
patchName patch == "d6e70e705323a50b616ffee9402245ab97de3e4e.patch"
131+
-> lib.versionAtLeast prev.php.version "8.2"
132+
) (attrs.patches or [ ]);
128133

129134
ourPatches =
130135
lib.optionals (lib.versionOlder prev.php.version "7.2") [
@@ -180,6 +185,17 @@ in
180185
# Patch rebased from https://github.com/php/php-src/commit/0a39890c967aa57225bb6bdf4821aff7a3a3c082
181186
# Fix compilation errors with libxml2 2.12
182187
./patches/libxml-ext.patch
188+
]
189+
++
190+
lib.optionals (lib.versionAtLeast prev.php.version "8.1" && lib.versionOlder prev.php.version "8.2")
191+
[
192+
(pkgs.fetchpatch {
193+
url = "https://github.com/php/php-src/commit/d6e70e705323a50b616ffee9402245ab97de3e4e.patch";
194+
hash = "sha256-Axu09l3uQ83qe30aDsR+Bt29cJiF4mLknwDyQf94vic=";
195+
includes = [
196+
"ext/dom/tests/gh10234.phpt"
197+
];
198+
})
183199
];
184200
in
185201
ourPatches ++ upstreamPatches;

0 commit comments

Comments
 (0)