amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into staging

Browse source
This commit is contained in:
Marius Bakke 2019-03-10 18:38:25 +01:00
commit 8c5533b582
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
70 changed files with 7610 additions and 1730 deletions
Download patch file Download diff file Expand all files Collapse all files

11
gnu/packages/python-xyz.scm
View file

@ -1355,7 +1355,7 @@ existing ones.")
(define-public scons
(package
(name "scons")
(version "3.0.3")
(version "3.0.4")
(source (origin
(method git-fetch)
(uri (git-reference
@ -1364,7 +1364,7 @@ existing ones.")
(file-name (git-file-name name version))
(sha256
(base32
"1xizkjgrvydkjhpv7i5rx0mdkp3618sis7jsckjh57nxcynlk5dc"))))
"1xy8jrwz87y589ihcld4hv7wn122sjbz914xn8h50ww77wbhk8hn"))))
(build-system python-build-system)
(arguments
`(#:use-setuptools? #f ; still relies on distutils
@ -1376,6 +1376,9 @@ existing ones.")
(substitute* "src/engine/SCons/compat/__init__.py"
(("sys.modules\\[new\\] = imp.load_module\\(old, \\*imp.find_module\\(old\\)\\)")
"sys.modules[new] = __import__(old)"))
(substitute* "src/engine/SCons/Platform/__init__.py"
(("mod = imp.load_module\\(full_name, file, path, desc\\)")
"mod = __import__(full_name)"))
(invoke "python" "bootstrap.py" "build/scons" "DEVELOPER=guix")
(chdir "build/scons")
#t)))))
@ -14712,14 +14715,14 @@ append on old values. Partd excels at shuffling operations.")
(define-public python-dask
(package
(name "python-dask")
(version "1.1.3")
(version "1.1.4")
(source
(origin
(method url-fetch)
(uri (pypi-uri "dask" version))
(sha256
(base32
"03ykmq46q2hh7mn68vcxkgylybjaj3r0kfspaiymdmqmjzpjivr5"))))
"1hrnfz4pzawikz9b622vjz2500n7hs25nz9msy1k8l4g7l2kr6ky"))))
(build-system python-build-system)
;; A single test out of 5000+ fails. This test is marked as xfail when
;; pytest-xdist is used.