[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
11/23: gnu: Add rust-ndarray-0.14.
From: |
guix-commits |
Subject: |
11/23: gnu: Add rust-ndarray-0.14. |
Date: |
Sun, 3 Apr 2022 07:15:28 -0400 (EDT) |
efraim pushed a commit to branch master
in repository guix.
commit 8b54123a9dc218365048f2a9ae56c1664dd7ab45
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Sun Apr 3 11:10:32 2022 +0300
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.
---
gnu/local.mk | 1 +
gnu/packages/crates-io.scm | 30 ++++++++++++++++++++++
.../rust-ndarray-0.14-remove-blas-src.patch | 25 ++++++++++++++++++
3 files changed, 56 insertions(+)
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"]
- branch master updated (3471b8fae2 -> b0ea8808b6), guix-commits, 2022/04/03
- 01/23: gnu: Add rust-document-features-0.2., guix-commits, 2022/04/03
- 07/23: gnu: Add rust-unicode-linebreak-0.1., guix-commits, 2022/04/03
- 06/23: gnu: Add rust-uniquote-3., guix-commits, 2022/04/03
- 08/23: gnu: Add rust-lipsum-0.8., guix-commits, 2022/04/03
- 05/23: gnu: Add rust-version-sync-0.9., guix-commits, 2022/04/03
- 10/23: gnu: rust-escargot-0.5: Update to 0.5.7., guix-commits, 2022/04/03
- 11/23: gnu: Add rust-ndarray-0.14.,
guix-commits <=
- 02/23: gnu: Add rust-kstring-1., guix-commits, 2022/04/03
- 03/23: gnu: Add rust-os-pipe-1., guix-commits, 2022/04/03
- 04/23: gnu: rust-os-pipe-0.9: Don't skip build., guix-commits, 2022/04/03
- 12/23: gnu: Add rust-smawk-0.3., guix-commits, 2022/04/03
- 15/23: gnu: Add rust-print-bytes-0.5., guix-commits, 2022/04/03
- 16/23: gnu: Add rust-os-str-bytes-6., guix-commits, 2022/04/03
- 19/23: gnu: rust-fsv-0.4: Update to 0.4.7., guix-commits, 2022/04/03
- 09/23: gnu: rust-terminal-size-0.1: Update to 0.1.17., guix-commits, 2022/04/03
- 21/23: gnu: rust-shlex-1: Update to 1.1.0., guix-commits, 2022/04/03
- 14/23: gnu: Add rust-os-str-bytes-4., guix-commits, 2022/04/03