php84Extensions.pdo_oci: fix build failure on PHP >= 8.4 (#382927)

Author: drupol

pkgs/development/php-packages/pcov/default.nix

@@ -1,14 +1,13 @@
 {
   buildPecl,
   lib,
-  php,
   pcre2,
   fetchFromGitHub,
   fetchpatch,
 }:
 
 let
-  version = "1.0.11";
+  version = "1.0.12";
 in
 buildPecl {
   inherit version;
@@ -17,8 +16,8 @@ buildPecl {
   src = fetchFromGitHub {
     owner = "krakjoe";
     repo = "pcov";
-    rev = "v${version}";
-    sha256 = "sha256-lyY17Y9chpTO8oeWmDGSh0YSnipYqCuy1qmn9su5Eu8=";
+    tag = "v${version}";
+    hash = "sha256-lyY17Y9chpTO8oeWmDGSh0YSnipYqCuy1qmn9su5Eu8=";
   };
 
   buildInputs = [ pcre2 ];
@@ -27,15 +26,15 @@ buildPecl {
     # Allow building for PHP 8.4
     (fetchpatch {
       url = "https://github.com/krakjoe/pcov/commit/7d764c7c2555e8287351961d72be3ebec4d8743f.patch";
-      sha256 = "sha256-5wIHrrCwUXQpPdUg+3Kwyop5yvOzQQ3qc4pQXU8q2OM=";
+      hash = "sha256-5wIHrrCwUXQpPdUg+3Kwyop5yvOzQQ3qc4pQXU8q2OM=";
     })
   ];
 
-  meta = with lib; {
+  meta = {
     changelog = "https://github.com/krakjoe/pcov/releases/tag/v${version}";
     description = "Self contained php-code-coverage compatible driver for PHP";
-    license = licenses.php301;
+    license = lib.licenses.php301;
     homepage = "https://github.com/krakjoe/pcov";
-    maintainers = teams.php.members;
+    maintainers = lib.teams.php.members;
   };
 }

pkgs/development/php-packages/pdo_oci/default.nix

@@ -0,0 +1,29 @@
+{
+  buildPecl,
+  lib,
+  oracle-instantclient,
+  php,
+}:
+
+buildPecl {
+  version = "1.1.0";
+  pname = "pdo_oci";
+
+  hash = "sha256-XKtpWH6Rn8s19Wlu15eb/6dcCpJ7Bc/pr9Pxi8L4S8c=";
+
+  buildInputs = [ oracle-instantclient ];
+  configureFlags = [ "--with-pdo-oci=instantclient,${oracle-instantclient.lib}/lib" ];
+
+  internalDeps = [ php.extensions.pdo ];
+  postPatch = ''
+    sed -i -e 's|OCISDKMANINC=`.*$|OCISDKMANINC="${oracle-instantclient.dev}/include"|' config.m4
+  '';
+
+  meta = {
+    changelog = "https://pecl.php.net/package-changelog.php?package=PDO_OCI";
+    description = "The PHP PDO_OCI extension lets you access Oracle Database";
+    license = lib.licenses.php301;
+    homepage = "https://pecl.php.net/package/pdo_oci";
+    maintainers = lib.teams.php.members;
+  };
+}

pkgs/top-level/php-packages.nix

@@ -342,22 +342,26 @@ lib.makeScope pkgs.newScope (
 
         pcov = callPackage ../development/php-packages/pcov { };
 
-        pdo_oci = buildPecl rec {
-          inherit (php.unwrapped) src version;
+        pdo_oci =
+          if (lib.versionAtLeast php.version "8.4") then
+            callPackage ../development/php-packages/pdo_oci { }
+          else
+            buildPecl rec {
+              inherit (php.unwrapped) src version;
 
-          pname = "pdo_oci";
-          sourceRoot = "php-${version}/ext/pdo_oci";
+              pname = "pdo_oci";
+              sourceRoot = "php-${version}/ext/pdo_oci";
 
-          buildInputs = [ pkgs.oracle-instantclient ];
-          configureFlags = [ "--with-pdo-oci=instantclient,${pkgs.oracle-instantclient.lib}/lib" ];
+              buildInputs = [ pkgs.oracle-instantclient ];
+              configureFlags = [ "--with-pdo-oci=instantclient,${pkgs.oracle-instantclient.lib}/lib" ];
 
-          internalDeps = [ php.extensions.pdo ];
-          postPatch = ''
-            sed -i -e 's|OCISDKMANINC=`.*$|OCISDKMANINC="${pkgs.oracle-instantclient.dev}/include"|' config.m4
-          '';
+              internalDeps = [ php.extensions.pdo ];
+              postPatch = ''
+                sed -i -e 's|OCISDKMANINC=`.*$|OCISDKMANINC="${pkgs.oracle-instantclient.dev}/include"|' config.m4
+              '';
 
-          meta.maintainers = lib.teams.php.members;
-        };
+              meta.maintainers = lib.teams.php.members;
+            };
 
         pdo_sqlsrv = callPackage ../development/php-packages/pdo_sqlsrv { };