aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages
diff options
context:
space:
mode:
authorMarius Bakke <mbakke@fastmail.com>2020-03-15 13:29:17 +0100
committerMarius Bakke <mbakke@fastmail.com>2020-03-15 15:09:06 +0100
commit382550f0be8f0023068dbd7005f0a29efeeea455 (patch)
treeed4259f57995a0c2fcd9a690520eedb49e124e57 /gnu/packages
parentc085742e07aab494c9c7f7e00fd6ff4e25eb0568 (diff)
downloadguix-382550f0be8f0023068dbd7005f0a29efeeea455.tar
guix-382550f0be8f0023068dbd7005f0a29efeeea455.tar.gz
gnu: python2-scikit-learn: Downgrade to 0.20.4.
This is a follow-up to commit 546893c2965c8114e4d7cfe1de46c46664ec4b9e. * gnu/packages/machine-learning.scm (python-scikit-learn)[properties]: New field. (python2-scikit-learn)[version, source]: New fields.
Diffstat (limited to 'gnu/packages')
-rw-r--r--gnu/packages/machine-learning.scm19
1 files changed, 17 insertions, 2 deletions
diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm
index 52e639723b..62ef7b84e4 100644
--- a/gnu/packages/machine-learning.scm
+++ b/gnu/packages/machine-learning.scm
@@ -1,7 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2015, 2016, 2017, 2018, 2019 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2016, 2020 Efraim Flashner <efraim@flashner.co.il>
-;;; Copyright © 2016, 2017 Marius Bakke <mbakke@fastmail.com>
+;;; Copyright © 2016, 2017, 2020 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2016 Hartmut Goebel <h.goebel@crazy-compilers.com>
;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Kei Kebreau <kkebreau@posteo.net>
@@ -847,10 +847,25 @@ computing environments.")
(description
"Scikit-learn provides simple and efficient tools for data mining and
data analysis.")
+ (properties `((python2-variant . ,(delay python2-scikit-learn))))
(license license:bsd-3)))
+;; scikit-learn 0.22 and later only supports Python 3, so we stick with
+;; an older version here.
(define-public python2-scikit-learn
- (package-with-python2 python-scikit-learn))
+ (let ((base (package-with-python2 (strip-python2-variant python-scikit-learn))))
+ (package
+ (inherit base)
+ (version "0.20.4")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/scikit-learn/scikit-learn.git")
+ (commit version)))
+ (file-name (git-file-name "python-scikit-learn" version))
+ (sha256
+ (base32
+ "08zbzi8yx5wdlxfx9jap61vg1malc9ajf576w7a0liv6jvvrxlpj")))))))
(define-public python-autograd
(let* ((commit "442205dfefe407beffb33550846434baa90c4de7")