[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
115/194: gnu: rust-openssl-sys-0.9: Update to 0.9.93.
From: |
guix-commits |
Subject: |
115/194: gnu: rust-openssl-sys-0.9: Update to 0.9.93. |
Date: |
Tue, 3 Oct 2023 14:57:42 -0400 (EDT) |
efraim pushed a commit to branch rust-team
in repository guix.
commit f5af4ae282aad72c882bc5380b13ea2f803b4781
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Mon Oct 2 10:34:30 2023 +0300
gnu: rust-openssl-sys-0.9: Update to 0.9.93.
* gnu/packages/crates-io.scm (rust-openssl-sys-0.9): Update to 0.9.93.
[source]: Remove patch. Add snippet to remove dependencies on boringssl
and openssl source.
* gnu/packages/patches/rust-openssl-src-no-vendor.patch: Remove file.
* gnu/local.mk (dist_patch_DATA): Remove it.
---
gnu/local.mk | 1 -
gnu/packages/crates-io.scm | 19 +++++++++----
.../patches/rust-openssl-sys-no-vendor.patch | 32 ----------------------
3 files changed, 13 insertions(+), 39 deletions(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index 1d621b5c54..3945b6b8ac 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1942,7 +1942,6 @@ dist_patch_DATA =
\
%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-openssl-sys-no-vendor.patch \
%D%/packages/patches/rust-webbrowser-remove-unsupported-os.patch \
%D%/packages/patches/rust-wl-clipboard-rs-newer-wl.patch \
%D%/packages/patches/rw-igraph-0.10.patch \
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index a8e1554894..77a0cceb10 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -44663,22 +44663,29 @@ system for OpenSSL.")
(define-public rust-openssl-sys-0.9
(package
(name "rust-openssl-sys")
- (version "0.9.87")
+ (version "0.9.93")
(source
(origin
(method url-fetch)
(uri (crate-uri "openssl-sys" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
- (base32 "0znc0q7a2gi2pmkscv0d6wzpfd64mgmy3w4lmrvrv05jcj9ga5wf"))
- (patches (search-patches "rust-openssl-sys-no-vendor.patch"))))
+ (base32 "078vnn4s18kj8m5sd7b684frhjnxjcjc9z7s7h4871s7q2j5ckfv"))
+ (snippet
+ #~(begin
+ (use-modules (guix build utils))
+ ;; Remove dependency on boringssl and vendor openssl source.
+ (substitute* "Cargo.toml.orig"
+ (("vendored = .*") "vendored = []\n")
+ ((".*bssl.*") "")
+ ((".*openssl-src.*") ""))
+ (copy-file "Cargo.toml.orig" "Cargo.toml")))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs
- (("rust-libc" ,rust-libc-0.2)
- ;; Build dependencies:
- ("rust-bindgen" ,rust-bindgen-0.64)
+ (("rust-bindgen" ,rust-bindgen-0.64)
("rust-cc" ,rust-cc-1)
+ ("rust-libc" ,rust-libc-0.2)
("rust-pkg-config" ,rust-pkg-config-0.3)
("rust-vcpkg" ,rust-vcpkg-0.2))))
(native-inputs
diff --git a/gnu/packages/patches/rust-openssl-sys-no-vendor.patch
b/gnu/packages/patches/rust-openssl-sys-no-vendor.patch
deleted file mode 100644
index 5872d4cf22..0000000000
--- a/gnu/packages/patches/rust-openssl-sys-no-vendor.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- openssl-sys-0.9.84/Cargo.toml.orig 2023-04-03 09:10:11.979197979 -0400
-+++ openssl-sys-0.9.84/Cargo.toml 2023-04-03 12:07:30.285315609 -0400
-@@ -31,10 +31,6 @@
- [package.metadata.pkg-config]
- openssl = "1.0.1"
-
--[dependencies.bssl-sys]
--version = "0.1.0"
--optional = true
--
- [dependencies.libc]
- version = "0.2"
-
-@@ -46,16 +42,12 @@
- [build-dependencies.cc]
- version = "1.0"
-
--[build-dependencies.openssl-src]
--version = "111"
--optional = true
--
- [build-dependencies.pkg-config]
- version = "0.3.9"
-
- [features]
--unstable_boringssl = ["bssl-sys"]
--vendored = ["openssl-src"]
-+unstable_boringssl = []
-+vendored = []
-
- [target."cfg(target_env = \"msvc\")".build-dependencies.vcpkg]
- version = "0.2.8"
- 118/194: gnu: python-cryptography-rust: Use cargo-test-flags., (continued)
- 118/194: gnu: python-cryptography-rust: Use cargo-test-flags., guix-commits, 2023/10/03
- 116/194: gnu: python-cryptography-vectors: Update to 41.0.4., guix-commits, 2023/10/03
- 125/194: gnu: Add rust-core-extensions-1., guix-commits, 2023/10/03
- 126/194: gnu: rust-is-macro-0.1: Update to 0.1.9., guix-commits, 2023/10/03
- 146/194: gnu: Add rust-serde-regex-1., guix-commits, 2023/10/03
- 142/194: gnu: Add rust-vlq-0.5., guix-commits, 2023/10/03
- 140/194: gnu: rust-swc: Update to 1.2.124., guix-commits, 2023/10/03
- 134/194: gnu: rust-unicode-segmentation-1: Update to 1.10.1., guix-commits, 2023/10/03
- 149/194: gnu: Add rust-ntest-test-cases-0.7., guix-commits, 2023/10/03
- 121/194: gnu: rust-ahash-0.7: Update to 0.7.6., guix-commits, 2023/10/03
- 115/194: gnu: rust-openssl-sys-0.9: Update to 0.9.93.,
guix-commits <=
- 133/194: gnu: Add rust-tstr-0.2., guix-commits, 2023/10/03
- 145/194: gnu: Add rust-serde-wasm-bindgen-0.3., guix-commits, 2023/10/03
- 138/194: gnu: Add rust-napi-build-1., guix-commits, 2023/10/03
- 151/194: gnu: Add rust-normpath-0.2., guix-commits, 2023/10/03
- 152/194: gnu: Add rust-magic-string-0.3., guix-commits, 2023/10/03
- 159/194: gnu: Add rust-auto-impl-0.4., guix-commits, 2023/10/03
- 158/194: gnu: Add rust-browserslist-rs-0.6., guix-commits, 2023/10/03
- 162/194: gnu: rust-assert-cmd-2: Update to 2.0.12., guix-commits, 2023/10/03
- 156/194: gnu: Add rust-debug-unreachable-0.1., guix-commits, 2023/10/03
- 157/194: gnu: Add rust-core-extensions-0.1., guix-commits, 2023/10/03