diff options
| author | Elis Hirwing <elis@hirwing.se> | 2021-01-10 14:23:09 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-10 14:23:09 +0100 |
| commit | 58d897e8128806616588b7c2dbef98184d3fe3fb (patch) | |
| tree | 2399db171440329796754b561befa30a93dff23a | |
| parent | f67a67a83dc7b53257ae56d3c979318c7c210a04 (diff) | |
| parent | b929911380d9ad754488247b37e3c895347fdfc6 (diff) | |
| download | nixlib-58d897e8128806616588b7c2dbef98184d3fe3fb.tar nixlib-58d897e8128806616588b7c2dbef98184d3fe3fb.tar.gz nixlib-58d897e8128806616588b7c2dbef98184d3fe3fb.tar.bz2 nixlib-58d897e8128806616588b7c2dbef98184d3fe3fb.tar.lz nixlib-58d897e8128806616588b7c2dbef98184d3fe3fb.tar.xz nixlib-58d897e8128806616588b7c2dbef98184d3fe3fb.tar.zst nixlib-58d897e8128806616588b7c2dbef98184d3fe3fb.zip | |
Merge pull request #108904 from aanderse/php-oci8
php80.extensions.oci8: 2.2.0 -> 3.0.1
| -rw-r--r-- | pkgs/development/php-packages/oci8/default.nix | 6 | ||||
| -rw-r--r-- | 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 02522a763072..95b6d96644d6 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"; + }); pdlib = callPackage ../development/php-packages/pdlib { }; |