01/01: gnu: php-with-bcmath: Deprecate in favour of 'php'.

[guix-commits]

wigust pushed a commit to branch master
in repository guix.

commit 8b6c91ba538f87d519ffa1d5d3fc3324fdaac85f
Author: Oleg Pykhalov <address@hidden>
Date:   Tue Jan 1 16:53:25 2019 +0300

    gnu: php-with-bcmath: Deprecate in favour of 'php'.
    
    This is a follow-up to 4629d26755aa06344fb8f515fb0202776e70c429.
    
    * gnu/packages/php.scm (php-with-bcmath): Deprecate in favour of 'php'.
    * gnu/tests/monitoring.scm (%zabbix-os): Use this.
---
 gnu/packages/php.scm     | 9 ++-------
 gnu/tests/monitoring.scm | 5 ++---
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/gnu/packages/php.scm b/gnu/packages/php.scm
index 1d33b17..a96f1c2 100644
--- a/gnu/packages/php.scm
+++ b/gnu/packages/php.scm
@@ -3,6 +3,7 @@
 ;;; Copyright © 2016 Marius Bakke <address@hidden>
 ;;; Copyright © 2018 Tobias Geerinckx-Rice <address@hidden>
 ;;; Copyright © 2018 Ricardo Wurmus <address@hidden>
+;;; Copyright © 2019 Oleg Pykhalov <address@hidden>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -353,10 +354,4 @@ systems, web content management systems and web 
frameworks." )
               license:expat))))                             ; ext/date/lib
 
 (define-public php-with-bcmath
-  (package
-    (inherit php)
-    (name "php-with-bcmath")
-    (arguments
-     (substitute-keyword-arguments (package-arguments php)
-       ((#:configure-flags flags)
-        `(cons "--enable-bcmath" ,flags))))))
+  (deprecated-package "php-with-bcmath" php))
diff --git a/gnu/tests/monitoring.scm b/gnu/tests/monitoring.scm
index ab72682..14d989d 100644
--- a/gnu/tests/monitoring.scm
+++ b/gnu/tests/monitoring.scm
@@ -1,6 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2018 Gábor Boskovits  <address@hidden>
-;;; Copyright © 2018 Oleg Pykhalov <address@hidden>
+;;; Copyright © 2018, 2019 Oleg Pykhalov <address@hidden>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -307,8 +307,7 @@ zabbix||{}
 
           (service php-fpm-service-type
                    (php-fpm-configuration
-                    (timezone "Europe/Paris")
-                    (php php-with-bcmath)))
+                    (timezone "Europe/Paris")))
 
           (service zabbix-server-service-type
                    (zabbix-server-configuration