diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2017-09-02 15:57:56 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2017-09-02 15:57:56 +0200 |
| commit | 30dfac27a5642c36e7bb1ba7966566864ba2d28d (patch) | |
| tree | 3b59623014eeea1df02cda5f926d803b9a36a828 /gnu/packages/php.scm | |
| parent | d2ee294c0400ac8f2a10f10c3c9644da513a3712 (diff) | |
| parent | 65e4109cdc96fbaee088f50d0138af8acef43141 (diff) | |
Merge branch 'master' into staging
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..bcf1d00829 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.9") (home-page "https://secure.php.net/") (source (origin (method url-fetch) @@ -71,7 +60,7 @@ name "-" version ".tar.xz")) (sha256 (base32 - "1aramb6dm57pr2iz61id9vzfy7h5qkb6bf7dxhrwnjk0723qahw9")) + "130y50nawipd12nbs10661vzk8gvy7zsqcsxvj29mwaivm4a777c")) (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) |