diff options
| author | Efraim Flashner <efraim@flashner.co.il> | 2017-10-01 19:59:55 +0300 |
|---|---|---|
| committer | Efraim Flashner <efraim@flashner.co.il> | 2017-10-01 22:16:22 +0300 |
| commit | 64df08f0cfac8f7a329002afa3461fd62a4b229c (patch) | |
| tree | 019909423138ceb49cdd86f1af48d366503db68f /gnu/packages/php.scm | |
| parent | b83ad3ace56c65a367e8f58c7b78323cf251b94b (diff) | |
| parent | 0ef1c223071869488c35b72b7407234c11425589 (diff) | |
| download | patches-64df08f0cfac8f7a329002afa3461fd62a4b229c.tar patches-64df08f0cfac8f7a329002afa3461fd62a4b229c.tar.gz | |
Merge remote-tracking branch 'origin/master' into core-updates
Diffstat (limited to 'gnu/packages/php.scm')
| -rw-r--r-- | gnu/packages/php.scm | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/gnu/packages/php.scm b/gnu/packages/php.scm index d0afab0931..fdea6c6d8f 100644 --- a/gnu/packages/php.scm +++ b/gnu/packages/php.scm @@ -49,21 +49,10 @@ #:use-module (guix build-system gnu) #:use-module ((guix licenses) #:prefix license:)) -(define gd-for-php - (package - (inherit gd) - (source (origin - (inherit (package-source gd)) - (patches - (append - (origin-patches (package-source gd)) - (search-patches "gd-CVE-2017-7890.patch"))))))) - - (define-public php (package (name "php") - (version "7.1.8") + (version "7.1.10") (home-page "https://secure.php.net/") (source (origin (method url-fetch) @@ -71,7 +60,7 @@ name "-" version ".tar.xz")) (sha256 (base32 - "1aramb6dm57pr2iz61id9vzfy7h5qkb6bf7dxhrwnjk0723qahw9")) + "02y52ml1svksx6fclg47vim2hnsva3531db7msrhpb9f39vzm3ib")) (modules '((guix build utils))) (snippet '(with-directory-excursion "ext" @@ -293,7 +282,7 @@ ("curl" ,curl) ("cyrus-sasl" ,cyrus-sasl) ("freetype" ,freetype) - ("gd" ,gd-for-php) + ("gd" ,gd-2.2.5) ("gdbm" ,gdbm) ("glibc" ,glibc) ("gmp" ,gmp) |