guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

02/06: gnu: python2-scikit-learn: Use strip-python2-variant.


From: Efraim Flashner
Subject: 02/06: gnu: python2-scikit-learn: Use strip-python2-variant.
Date: Fri, 2 Sep 2016 03:44:54 +0000 (UTC)

efraim pushed a commit to branch master
in repository guix.

commit 25a2f81f9b554e600f38ffaa89305cac3653d7a3
Author: Efraim Flashner <address@hidden>
Date:   Thu Sep 1 22:44:03 2016 +0300

    gnu: python2-scikit-learn: Use strip-python2-variant.
    
    * gnu/packages/python.scm (python2-scikit-learn): Replace package
    definition with 'package-with-python2', using 'strip-python2-variant'
    to simplify the package definition.
---
 gnu/packages/python.scm |   13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 09fe627..15a2a39 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -2885,18 +2885,11 @@ and is very extensible.")
     (description
      "Scikit-learn provides simple and efficient tools for data
 mining and data analysis.")
-    (license license:bsd-3)))
+    (license license:bsd-3)
+    (properties `((python2-variant . ,(delay python2-scikit-learn))))))
 
 (define-public python2-scikit-learn
-  (let ((scikit (package-with-python2 python-scikit-learn)))
-    (package (inherit scikit)
-      (propagated-inputs
-       `(("python2-numpy" ,python2-numpy)
-         ("python2-scipy" ,python2-scipy)
-         ,@(alist-delete
-            "python-numpy"
-            (alist-delete
-             "python-scipy" (package-propagated-inputs scikit))))))))
+  (package-with-python2 (strip-python2-variant python-scikit-learn)))
 
 (define-public python-scikit-image
   (package



reply via email to

[Prev in Thread] Current Thread [Next in Thread]