From b929911380d9ad754488247b37e3c895347fdfc6 Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Sat, 9 Jan 2021 20:06:20 -0500 Subject: php80.extensions.oci8: 2.2.0 -> 3.0.1 --- pkgs/development/php-packages/oci8/default.nix | 6 ++---- pkgs/top-level/php-packages.nix | 8 +++++++- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/development/php-packages/oci8/default.nix b/pkgs/development/php-packages/oci8/default.nix index ea699c2034e8..697ad6740200 100644 --- a/pkgs/development/php-packages/oci8/default.nix +++ b/pkgs/development/php-packages/oci8/default.nix @@ -1,10 +1,8 @@ -{ buildPecl, lib, pkgs }: - +{ buildPecl, lib, pkgs, version, sha256 }: buildPecl { pname = "oci8"; - version = "2.2.0"; - sha256 = "0jhivxj1nkkza4h23z33y7xhffii60d7dr51h1czjk10qywl7pyd"; + inherit version sha256; buildInputs = [ pkgs.oracle-instantclient ]; configureFlags = [ "--with-oci8=shared,instantclient,${pkgs.oracle-instantclient.lib}/lib" ]; diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index cc8ba346ae56..b9923d6998f1 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -78,7 +78,13 @@ lib.makeScope pkgs.newScope (self: with self; { mongodb = callPackage ../development/php-packages/mongodb { }; - oci8 = callPackage ../development/php-packages/oci8 { }; + oci8 = callPackage ../development/php-packages/oci8 ({ + version = "2.2.0"; + sha256 = "0jhivxj1nkkza4h23z33y7xhffii60d7dr51h1czjk10qywl7pyd"; + } // lib.optionalAttrs (lib.versionAtLeast php.version "8.0") { + version = "3.0.1"; + sha256 = "108ds92620dih5768z19hi0jxfa7wfg5hdvyyvpapir87c0ap914"; + }); pcov = callPackage ../development/php-packages/pcov { }; -- cgit 1.4.1