| 13 Aug 2024 |
 piotrkwiecinski | also is it ok to go to master? | 18:28:30 |
| piotrkwiecinski | it has fair bit of rebuilds | 18:28:36 |
 Pol | yes master is fine. | 18:29:01 |
| piotrkwiecinski | > calling 'postUnpack' function hook '_updateSourceDateEpochFromSourceRoot'
> Running phase: patchPhase
> applying patch /nix/store/r2bw91ma55jqnlv51iwck17f05i1c76x-fix-paths-php7.patch
> patching file ext/gettext/config.m4
| 18:29:07 |
| piotrkwiecinski | this one is in generic.nix | 18:29:16 |
| Pol | yes, since quite a while | 18:30:15 |
| piotrkwiecinski | https://github.com/php/php-src/commit/c2d6edc4854b036a94e28b495ccbc1b652649b02 | 18:57:21 |
| piotrkwiecinski | I think it's the cause | 18:57:26 |
| piotrkwiecinski | for the gettext failure | 18:57:48 |
| piotrkwiecinski | we'll have to prepare a new patch for 8.4 | 18:58:07 |
| piotrkwiecinski | alpha4 was released 2 weeks ago and doesn't have this code yet | 19:08:58 |
| piotrkwiecinski | but beta1 was tagged today | 19:09:12 |
| piotrkwiecinski | I'll see if I can prepare the patch for gettext later this week | 19:09:35 |
| 14 Aug 2024 |
| piotrkwiecinski | damn patches :D | 13:16:03 |
| piotrkwiecinski | I have a fix on local for gettext but ext-dom fails with beta1 build
> Running phase: patchPhase
> applying patch /nix/store/hqrpdj07y97vwiyy29jizcsmvx9hdnys-8d7365b6f009ba43e305d6459013ac4fbed7c606.diff?full_index=1
> patching file ext/dom/tests/modern/extensions/Element_substitutedNodeValue.phpt
> Reversed (or previously applied) patch detected! Assume -R? [n]
> Apply anyway? [n]
> Skipping patch.
> 2 out of 2 hunks ignored -- saving rejects to file ext/dom/tests/modern/extensions/Element_substitutedNodeValue.phpt.rej
| 13:17:05 |
| piotrkwiecinski | maybe its because try to apply a patch to for alpha1 | 13:18:59 |
| Pol | #facepalm | 13:21:24 |
| piotrkwiecinski | if I'm not mistaken 8.4 is scheduled for the next staging-next merge | 13:22:33 |
| piotrkwiecinski | so we'll have to wait a bit till I can update it to beta1 | 13:22:51 |
| piotrkwiecinski | I'll have update prepared | 13:23:15 |
| Pol | In reply to @piotrkwiecinski:matrix.org
if I'm not mistaken 8.4 is scheduled for the next staging-next merge it has been merged this morning, so it's coming very soon. | 13:24:14 |
| piotrkwiecinski | Is this correct syntax ? | 13:27:59 |
| piotrkwiecinski | patches = lib.optional (lib.versionOlder version "8.4.0beta1") [
./fix-paths-php7.patch
] ++ lib.optional (lib.versionAtLeast version "8.4.0beta1") [
./fix-paths-php84.patch
] ++ extraPatches;
| 13:28:00 |
| piotrkwiecinski | if this works as expected i can PR it earlier | 13:28:50 |
| piotrkwiecinski | ok seems to build | 13:31:37 |
| Pol | no | 13:31:40 |
| Pol | By using lib.optional <predicate> [ ], you're wrapping twice. | 13:32:04 |
| Pol | In this case, you have to use lib.optionals <predicate> [ ] | 13:32:20 |
| Pol | (hense the s) | 13:32:28 |
| piotrkwiecinski | somehow it built without s too | 13:34:28 |
