aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEfraim Flashner <efraim@flashner.co.il>2020-12-15 10:20:16 +0200
committerEfraim Flashner <efraim@flashner.co.il>2020-12-15 10:57:37 +0200
commit7d9d474dd292884eb628231dbe34b743e6f9bd39 (patch)
treee300bd6125e6ae4ac4c937a4130a86e428850e86
parentf18f86c9813d4231b57bcb680d0fb9fe667e639d (diff)
downloadguix-7d9d474dd292884eb628231dbe34b743e6f9bd39.tar
guix-7d9d474dd292884eb628231dbe34b743e6f9bd39.tar.gz
gnu: Add rust-ndarray-0.12.
* gnu/packages/crates-io.scm (rust-ndarray-0.12): New variable. * gnu/packages/patches/rust-ndarray-remove-blas-src-dep.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it.
-rw-r--r--gnu/local.mk1
-rw-r--r--gnu/packages/crates-io.scm33
-rw-r--r--gnu/packages/patches/rust-ndarray-remove-blas-src-dep.patch36
3 files changed, 70 insertions, 0 deletions
diff --git a/gnu/local.mk b/gnu/local.mk
index 0b4cf23838..59ef362a16 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1592,6 +1592,7 @@ dist_patch_DATA = \
%D%/packages/patches/rust-1.45-linker-locale.patch \
%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-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 49f865c841..385160dd90 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -16874,6 +16874,39 @@ IO of Windows's named pipes.")
"This package provides a crate to perform natural ordering for Rust.")
(license license:expat)))
+(define-public rust-ndarray-0.12
+ (package
+ (name "rust-ndarray")
+ (version "0.12.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "ndarray" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (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)
+ ("rust-matrixmultiply" ,rust-matrixmultiply-0.1)
+ ("rust-num-complex" ,rust-num-complex-0.2)
+ ("rust-cblas-sys" ,rust-cblas-sys-0.1)
+ ("rust-rustc-serialize" ,rust-rustc-serialize-0.3)
+ ("rust-serde" ,rust-serde-1))
+ #: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))))
+
(define-public rust-net2-0.2
(package
(name "rust-net2")
diff --git a/gnu/packages/patches/rust-ndarray-remove-blas-src-dep.patch b/gnu/packages/patches/rust-ndarray-remove-blas-src-dep.patch
new file mode 100644
index 0000000000..7221fdd608
--- /dev/null
+++ b/gnu/packages/patches/rust-ndarray-remove-blas-src-dep.patch
@@ -0,0 +1,36 @@
+From ed09f3c91e915c3b436854a7936566edceb3e8de Mon Sep 17 00:00:00 2001
+From: Efraim Flashner <efraim@flashner.co.il>
+Date: Tue, 15 Dec 2020 10:09:45 +0200
+Subject: [PATCH] remove blas-src dependency
+
+---
+ 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
+@@ -37,10 +37,6 @@ debug = true
+ name = "ndarray"
+ test = true
+ bench = false
+-[dependencies.blas-src]
+-version = "0.2.0"
+-optional = true
+-default-features = false
+
+ [dependencies.cblas-sys]
+ version = "0.1.4"
+@@ -78,7 +74,7 @@ default-features = false
+ version = "0.1"
+
+ [features]
+-blas = ["cblas-sys", "blas-src"]
++blas = ["cblas-sys"]
+ docs = ["rustc-serialize", "serde-1"]
+ serde-1 = ["serde"]
+ test = ["test-blas-openblas-sys"]
+--
+2.29.2
+