aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gnu/local.mk1
-rw-r--r--gnu/packages/crates-io.scm49
-rw-r--r--gnu/packages/patches/rust-ndarray-0.13-remove-blas-src.patch28
3 files changed, 70 insertions, 8 deletions
diff --git a/gnu/local.mk b/gnu/local.mk
index 24949c143f..953bff96d4 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1674,6 +1674,7 @@ dist_patch_DATA = \
%D%/packages/patches/rust-bootstrap-stage0-test.patch \
%D%/packages/patches/rust-coresimd-doctest.patch \
%D%/packages/patches/rust-ndarray-remove-blas-src-dep.patch \
+ %D%/packages/patches/rust-ndarray-0.13-remove-blas-src.patch \
%D%/packages/patches/rust-nettle-disable-vendor.patch \
%D%/packages/patches/rust-nettle-sys-disable-vendor.patch \
%D%/packages/patches/rust-reproducible-builds.patch \
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index a279f40653..111b4fa34b 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -27125,8 +27125,48 @@ established.")
library.")
(license license:expat)))
+(define-public rust-ndarray-0.13
+ (package
+ (name "rust-ndarray")
+ (version "0.13.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "ndarray" version))
+ (file-name
+ (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "02dbwj3b7d0cpy29nhw31n51h3cwm4s1q6narl7fwiigxh1xn1mc"))
+ (patches
+ (search-patches "rust-ndarray-0.13-remove-blas-src.patch"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:skip-build? #t
+ #:cargo-inputs
+ (("rust-approx" ,rust-approx-0.3)
+ ("rust-cblas-sys" ,rust-cblas-sys-0.1)
+ ("rust-matrixmultiply" ,rust-matrixmultiply-0.2)
+ ("rust-num-complex" ,rust-num-complex-0.2)
+ ("rust-num-integer" ,rust-num-integer-0.1)
+ ("rust-num-traits" ,rust-num-traits-0.2)
+ ("rust-rawpointer" ,rust-rawpointer-0.2)
+ ("rust-rayon" ,rust-rayon-1)
+ ("rust-serde" ,rust-serde-1))
+ #:cargo-development-inputs
+ (("rust-defmac" ,rust-defmac-0.2)
+ ("rust-itertools" ,rust-itertools-0.8)
+ ("rust-quickcheck" ,rust-quickcheck-0.9))))
+ (home-page "https://github.com/rust-ndarray/ndarray")
+ (synopsis "N-dimensional container for general elements and for numerics")
+ (description "@code{ndarray} implements an n-dimensional container for
+general elements and for numerics.")
+ (license (list license:asl2.0
+ license:expat))))
+
(define-public rust-ndarray-0.12
(package
+ (inherit rust-ndarray-0.13)
(name "rust-ndarray")
(version "0.12.1")
(source
@@ -27138,7 +27178,6 @@ library.")
(base32
"0a5rfwcbqnvbwi3nw5sfz6kf0flhmjxs64s0b4kxc6lhmyl81wvw"))
(patches (search-patches "rust-ndarray-remove-blas-src-dep.patch"))))
- (build-system cargo-build-system)
(arguments
`(#:cargo-inputs
(("rust-itertools" ,rust-itertools-0.7)
@@ -27150,13 +27189,7 @@ library.")
#:cargo-development-inputs
(("rust-defmac" ,rust-defmac-0.1)
("rust-quickcheck" ,rust-quickcheck-0.7)
- ("rust-rawpointer" ,rust-rawpointer-0.1))))
- (home-page "https://github.com/rust-ndarray/ndarray")
- (synopsis "N-dimensional container for general elements and for numerics")
- (description "@code{ndarray} implements an n-dimensional container for
-general elements and for numerics.")
- (license (list license:asl2.0
- license:expat))))
+ ("rust-rawpointer" ,rust-rawpointer-0.1))))))
(define-public rust-ndk-0.2
(package
diff --git a/gnu/packages/patches/rust-ndarray-0.13-remove-blas-src.patch b/gnu/packages/patches/rust-ndarray-0.13-remove-blas-src.patch
new file mode 100644
index 0000000000..936c099ce4
--- /dev/null
+++ b/gnu/packages/patches/rust-ndarray-0.13-remove-blas-src.patch
@@ -0,0 +1,28 @@
+ Cargo.toml | 6 +-----
+ 1 file changed, 1 insertion(+), 5 deletions(-)
+
+diff --git a/Cargo.toml b/Cargo.toml
+index 1f3e1b6..36bc816 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -43,11 +43,6 @@
+ version = "0.3.2"
+ optional = true
+
+-[dependencies.blas-src]
+-version = "0.2.0"
+-optional = true
+-default-features = false
+-
+ [dependencies.cblas-sys]
+ version = "0.1.4"
+ optional = true
+@@ -91,7 +86,7 @@
+ default-features = false
+
+ [features]
+-blas = ["cblas-sys", "blas-src"]
++blas = ["cblas-sys"]
+ docs = ["approx", "serde", "rayon"]
+ serde-1 = ["serde"]
+ test = ["test-blas-openblas-sys"]