public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #91495 from ckauhaus/secfix-php

Browse Source 
php: 7.2.29 -> 7.2.31, 7.3.16 -> 7.3.19, 7.4.6 -> 7.4.7
This commit is contained in:
Maximilian Bosch 2020-06-25 19:28:36 +02:00 committed by GitHub
commit 860c5ca4a7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/development/interpreters/php/default.nix
View File

@ -264,24 +264,24 @@ let
}; };
php72base = callPackage generic (_args // { php72base = callPackage generic (_args // {
version = "7.2.29"; version = "7.2.31";
sha256 = "08xry2fgqgg8s0ym1hh11wkbr36av3zq1bn4krbciw1b7x8gb8ga"; sha256 = "0057x1s43f9jidmrl8daka6wpxclxc1b1pm5cjbz616p8nbmb9qv";
# https://bugs.php.net/bug.php?id=76826 # https://bugs.php.net/bug.php?id=76826
extraPatches = lib.optional stdenv.isDarwin ./php72-darwin-isfinite.patch; extraPatches = lib.optional stdenv.isDarwin ./php72-darwin-isfinite.patch;
}); });
php73base = callPackage generic (_args // { php73base = callPackage generic (_args // {
version = "7.3.16"; version = "7.3.19";
sha256 = "0bh499v9dfgh9k51w4rird1slb9rh9whp5h37fb84c98d992s1xq"; sha256 = "199l1lr7ima92icic7b1bqlb036md78m305lc3v6zd4zw8qix70d";
# https://bugs.php.net/bug.php?id=76826 # https://bugs.php.net/bug.php?id=76826
extraPatches = lib.optional stdenv.isDarwin ./php73-darwin-isfinite.patch; extraPatches = lib.optional stdenv.isDarwin ./php73-darwin-isfinite.patch;
}); });
php74base = callPackage generic (_args // { php74base = callPackage generic (_args // {
version = "7.4.6"; version = "7.4.7";
sha256 = "0j133pfwa823d4jhx2hkrrzjl4hswvz00b1z58r5c82xd5sr9vd6"; sha256 = "0ynq4fz54jpzh9nxvbgn3vrdad2clbac0989ai0yrj2ryc0hs3l0";
}); });
defaultPhpExtensions = { all, ... }: with all; ([ defaultPhpExtensions = { all, ... }: with all; ([

10
pkgs/top-level/php-packages.nix
View File

@ -3,7 +3,7 @@
, html-tidy, libzip, zlib, pcre, pcre2, libxslt, aspell, openldap, cyrus_sasl , html-tidy, libzip, zlib, pcre, pcre2, libxslt, aspell, openldap, cyrus_sasl
, uwimap, pam, libiconv, enchant1, libXpm, gd, libwebp, libjpeg, libpng , uwimap, pam, libiconv, enchant1, libXpm, gd, libwebp, libjpeg, libpng
, freetype, libffi, freetds, postgresql, sqlite, net-snmp, unixODBC, libedit , freetype, libffi, freetds, postgresql, sqlite, net-snmp, unixODBC, libedit
, readline, rsync , readline, rsync, fetchpatch
}: }:
let let
@ -965,7 +965,13 @@ in
# uwimap doesn't build on darwin. # uwimap doesn't build on darwin.
enable = (!stdenv.isDarwin); } enable = (!stdenv.isDarwin); }
# interbase (7.3, 7.2) # interbase (7.3, 7.2)
{ name = "intl"; buildInputs = [ icu ]; } { name = "intl";
buildInputs = [ icu ];
patches = lib.optional (lib.versionOlder php.version "7.4") (fetchpatch {
url = "https://github.com/php/php-src/commit/93a9b56c90c334896e977721bfb3f38b1721cec6.patch";
sha256 = "055l40lpyhb0rbjn6y23qkzdhvpp7inbnn6x13cpn4inmhjqfpg4";
});
}
{ name = "json"; } { name = "json"; }
{ name = "ldap"; { name = "ldap";
buildInputs = [ openldap cyrus_sasl ]; buildInputs = [ openldap cyrus_sasl ];