flake.lock: Update

Flake lock file updates: • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/4989a246d7a390a859852baddb1013f825435cee' (2024-12-17) → 'github:NixOS/nixpkgs/5757bbb8bd7c0630a0cc4bb19c47e588db30b97c' (2025-01-22)
fossar · Jan 25, 2025 · ad302e3 · ad302e3
1 parent 4f1690e
commit ad302e3
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 4 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/pkgs/package-overrides.nix b/pkgs/package-overrides.nix
@@ -296,7 +296,44 @@ in
             url = "https://github.com/php/php-src/commit/632b6e7aac207194adc3d0b41615bfb610757f41.patch";
             sha256 = "0xn3ivhc4p070vbk5yx0mzj2n7p04drz3f98i77amr51w0vzv046";
           })
-        ];
+        ]
+        ++
+          lib.optionals (lib.versionAtLeast prev.php.version "8.0" && lib.versionOlder prev.php.version "8.1")
+            [
+              # Throw instead of letting gettext > 0.22.5 crash with `SIGABRT`
+              # when passing `LC_ALL` category to `dcgettext`/`dcngettext` functions.
+              #
+              # This surfaced as a failure of `dcngettext` test, which passes `0`
+              # as a `$category` to those functions. It only affected Darwin
+              # because it defines `LC_ALL` as 0. On Linux, glibc defines `LC_CTYPE` as 0.
+              #
+              # https://github.com/php/php-src/commit/9999a0cb757344974889a6f548727de6f2c3c10d
+              (pkgs.fetchpatch {
+                url = "https://github.com/php/php-src/commit/9999a0cb757344974889a6f548727de6f2c3c10d.patch";
+                hash = "sha256-LHNU6qwn5//z9VVn3aQkQMYEt/LjKgyIUvDen0dhJdg=";
+                excludes = [
+                  "NEWS"
+                  "UPGRADING"
+                ];
+              })
+            ];
+
+      postPatch =
+        attrs.postPatch or ""
+        +
+          lib.optionalString
+            (
+              lib.versionAtLeast prev.php.version "7.1"
+              && lib.versionOlder prev.php.version "8.0"
+              && pkgs.stdenv.isDarwin
+            )
+            ''
+              # Disable test failing on Darwin (see 9999a0cb757344974889a6f548727de6f2c3c10d above)
+              # We do not apply the fix because passing category to `dcgettext`/`dcngettext` functions should be rare.
+              # I only found one result on GitHub other than PHP tests and it is a WordPress dead for over ten years:
+              # https://github.com/search?utf8=%E2%9C%93&q=%2Fdcn%3Fgettext.%2B%28LC_ALL%7C0%29%2F+language%3APHP&type=code
+              rm ext/gettext/tests/dcngettext.phpt
+            '';
     });
 
     grpc =