ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-26 14:28:15 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: python2-pandas: Fix build with Python 2.7.17.

Browse source 
While at it, fix the inheritance.

* gnu/packages/python-science.scm (python2-pandas): Use INHERIT instead of
PACKAGE/INHERIT.
[source](modules, snippet): New fields.
This commit is contained in:
Marius Bakke 2020-03-15 13:30:11 +01:00
parent 382550f0be
commit 3987715415
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
1 changed files with 19 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
gnu/packages/python-science.scm
View file

@ -4,7 +4,7 @@
;;; Copyright © 2016 Ben Woodcroft <donttrustben@gmail.com> ;;; Copyright © 2016 Ben Woodcroft <donttrustben@gmail.com>
;;; Copyright © 2016 Hartmut Goebel <h.goebel@crazy-compilers.com> ;;; Copyright © 2016 Hartmut Goebel <h.goebel@crazy-compilers.com>
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016, 2017, 2018, 2019 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2016, 2017, 2018, 2019, 2020 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2019 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2019 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2019 Giacomo Leidi <goodoldpaul@autistici.org> ;;; Copyright © 2019 Giacomo Leidi <goodoldpaul@autistici.org>
@ -277,12 +277,21 @@ (define-public python-pandas
(define-public python2-pandas (define-public python2-pandas
(let ((pandas (package-with-python2 (let ((pandas (package-with-python2
(strip-python2-variant python-pandas)))) (strip-python2-variant python-pandas))))
(package/inherit (package
pandas (inherit pandas)
(version "0.24.2") (version "0.24.2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "pandas" version)) (uri (pypi-uri "pandas" version))
(sha256 (sha256
(base32 (base32
"18imlm8xbhcbwy4wa957a1fkamrcb0z988z006jpfda3ki09z4ag"))))))) "18imlm8xbhcbwy4wa957a1fkamrcb0z988z006jpfda3ki09z4ag"))
(modules '((guix build utils)))
(snippet
'(begin
;; Adjust for renamed error message in Python 2.7.17. Taken
;; from <https://github.com/pandas-dev/pandas/pull/29294>.
(substitute* "pandas/io/parsers.py"
(("if 'NULL byte' in msg:")
"if 'NULL byte' in msg or 'line contains NUL' in msg:"))
#t)))))))