summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEfraim Flashner <efraim@flashner.co.il>2022-04-03 11:10:32 +0300
committerEfraim Flashner <efraim@flashner.co.il>2022-04-03 14:07:48 +0300
commit8b54123a9dc218365048f2a9ae56c1664dd7ab45 (patch)
tree228b3709ff9faafac6a71a6821b6493f1548da49
parent73e231280267491d5f3b115f610d3a7c4b95a0f6 (diff)
downloadguix-patches-8b54123a9dc218365048f2a9ae56c1664dd7ab45.tar
guix-patches-8b54123a9dc218365048f2a9ae56c1664dd7ab45.tar.gz
gnu: Add rust-ndarray-0.14.
* gnu/packages/crates-io.scm (rust-ndarray-0.14): New variable. * gnu/packages/patches/rust-ndarray-0.14-remove-blas-src.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it.
-rw-r--r--gnu/local.mk1
-rw-r--r--gnu/packages/crates-io.scm30
-rw-r--r--gnu/packages/patches/rust-ndarray-0.14-remove-blas-src.patch25
3 files changed, 56 insertions, 0 deletions
diff --git a/gnu/local.mk b/gnu/local.mk
index a704161abc..4bff8d8f6e 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1775,6 +1775,7 @@ dist_patch_DATA = \
%D%/packages/patches/i3status-rust-enable-unstable-features.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-ndarray-0.14-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-openssl-sys-no-vendor.patch \
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 2c3bc50083..f0feefa076 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -36289,6 +36289,36 @@ general elements and for numerics.")
(license (list license:asl2.0
license:expat))))
+(define-public rust-ndarray-0.14
+ (package
+ (inherit rust-ndarray-0.15)
+ (name "rust-ndarray")
+ (version "0.14.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "ndarray" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "011wqzmrd9gpfcfvy1xfbskqfiahn96pmi2d0r9x34d682amq3bc"))
+ (patches (search-patches "rust-ndarray-0.14-remove-blas-src.patch"))))
+ (arguments
+ `(#:cargo-inputs
+ (("rust-approx" ,rust-approx-0.4)
+ ("rust-cblas-sys" ,rust-cblas-sys-0.1)
+ ("rust-matrixmultiply" ,rust-matrixmultiply-0.2)
+ ("rust-num-complex" ,rust-num-complex-0.3)
+ ("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-approx" ,rust-approx-0.4)
+ ("rust-defmac" ,rust-defmac-0.2)
+ ("rust-itertools" ,rust-itertools-0.9)
+ ("rust-quickcheck" ,rust-quickcheck-0.9))))))
+
(define-public rust-ndarray-0.13
(package
(inherit rust-ndarray-0.15)
diff --git a/gnu/packages/patches/rust-ndarray-0.14-remove-blas-src.patch b/gnu/packages/patches/rust-ndarray-0.14-remove-blas-src.patch
new file mode 100644
index 0000000000..7f100d04bd
--- /dev/null
+++ b/gnu/packages/patches/rust-ndarray-0.14-remove-blas-src.patch
@@ -0,0 +1,25 @@
+diff --git a/Cargo.toml b/Cargo.toml
+index 57924f1..0c59727 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -43,11 +43,6 @@ bench = false
+ version = "0.4"
+ optional = true
+
+-[dependencies.blas-src]
+-version = "0.6.1"
+-optional = true
+-default-features = false
+-
+ [dependencies.cblas-sys]
+ version = "0.1.4"
+ optional = true
+@@ -92,7 +87,7 @@ version = "0.9"
+ default-features = false
+
+ [features]
+-blas = ["cblas-sys", "blas-src"]
++blas = ["cblas-sys"]
+ docs = ["approx", "serde", "rayon"]
+ serde-1 = ["serde"]
+ test = ["test-blas-openblas-sys"]