diff options
| author | Aaron Andersen <aaron@fosslib.net> | 2020-02-01 08:05:06 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-01 08:05:06 -0500 |
| commit | d5bf8b2359242f5d7dc1d4c346cc0393ca2a4a25 (patch) | |
| tree | d3a2cc418963744bb4d19dd5c48eda264f46fad0 /pkgs/top-level | |
| parent | 8b92ddf24b08932d77423f7764619e457d3ef48e (diff) | |
| parent | a6bc6fbb0bfebac2bffa2f2456a4bf868de0446b (diff) | |
| download | nixlib-d5bf8b2359242f5d7dc1d4c346cc0393ca2a4a25.tar nixlib-d5bf8b2359242f5d7dc1d4c346cc0393ca2a4a25.tar.gz nixlib-d5bf8b2359242f5d7dc1d4c346cc0393ca2a4a25.tar.bz2 nixlib-d5bf8b2359242f5d7dc1d4c346cc0393ca2a4a25.tar.lz nixlib-d5bf8b2359242f5d7dc1d4c346cc0393ca2a4a25.tar.xz nixlib-d5bf8b2359242f5d7dc1d4c346cc0393ca2a4a25.tar.zst nixlib-d5bf8b2359242f5d7dc1d4c346cc0393ca2a4a25.zip | |
Merge pull request #78975 from aanderse/sqlsrv
phpPackages.sqlsrv & pdo_sqlsrv: 5.6.1 -> 5.8.0
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/php-packages.nix | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 8a610392110d..e439ebe71881 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -288,14 +288,12 @@ let }; pdo_sqlsrv = buildPecl { - version = "5.6.1"; + version = "5.8.0"; pname = "pdo_sqlsrv"; - sha256 = "02ill1iqffa5fha9iz4y91823scml24ikfk8pn90jyycfwv07x6a"; + sha256 = "0z4vbyd851b4jr6p69l2ylk91iihndsm2qjb429pxcv8g6dqzqll"; - buildInputs = [ pkgs.unixODBC ]; - - meta.broken = isPhp74; # Build error + buildInputs = [ pkgs.unixODBC ] ++ pkgs.lib.optionals pkgs.stdenv.isDarwin [ pkgs.libiconv ]; }; php-cs-fixer = mkDerivation rec { @@ -614,14 +612,12 @@ let }; sqlsrv = buildPecl { - version = "5.6.1"; + version = "5.8.0"; pname = "sqlsrv"; - sha256 = "0ial621zxn9zvjh7k1h755sm2lc9aafc389yxksqcxcmm7kqmd0a"; + sha256 = "1kv4krk1w4hri99b0sdgwgy9c4y0yh217wx2y3irhkfi46kdrjnw"; - buildInputs = [ pkgs.unixODBC ]; - - meta.broken = isPhp74; # Build error + buildInputs = [ pkgs.unixODBC ] ++ pkgs.lib.optionals pkgs.stdenv.isDarwin [ pkgs.libiconv ]; }; v8 = buildPecl { |