From ab008c4a90a36789ca73813784dd0bb534e8316b Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Wed, 17 May 2023 10:26:23 +0300
Subject: gnu: rust-nettle-sys-2: Update to 2.2.0.
* gnu/packages/crates-io.scm (rust-nettle-sys-2): Update to 2.2.0.
[source]: Remove patch.
[cargo-inputs]: Add rust-cc-1, rust-libc-0.2, rust-tempfile-3,
rust-vcpkg-0.2. Replace rust-bindgen-0.51 with 0.63.
* gnu/packages/patches/rust-nettle-sys-disable-vendor.patch: Remove file.
* gnu/local.mk (dist_patch_DATA): Remove it.
---
.../patches/rust-nettle-sys-disable-vendor.patch | 48 ----------------------
1 file changed, 48 deletions(-)
delete mode 100644 gnu/packages/patches/rust-nettle-sys-disable-vendor.patch
(limited to 'gnu/packages/patches/rust-nettle-sys-disable-vendor.patch')
diff --git a/gnu/packages/patches/rust-nettle-sys-disable-vendor.patch b/gnu/packages/patches/rust-nettle-sys-disable-vendor.patch
deleted file mode 100644
index ae5ef5ebe0..0000000000
--- a/gnu/packages/patches/rust-nettle-sys-disable-vendor.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-Subject: nettle-sys: clear out "vendored" feature cruft from build.rs
-From: Daniel Kahn Gillmor's avatarDaniel Kahn Gillmor <dkg@fifthhorseman.net>
-
-https://salsa.debian.org/rust-team/debcargo-conf/-/commit/0c71150ad26bb66a8396dcdab055181af232ddc5
-https://sources.debian.org/src/rust-nettle-sys/2.0.4-3/debian/patches/disable-vendor.diff/
---- a/Cargo.toml 2019-10-23 13:08:07.000000000 -0400
-+++ b/Cargo.toml 2019-10-23 14:08:46.644064014 -0400
-@@ -29,12 +29,9 @@
- version = "0.51.1"
- default-features = false
-
--[build-dependencies.nettle-src]
--version = "3.5.1-0"
--optional = true
--
- [build-dependencies.pkg-config]
- version = "0.3"
-
- [features]
- vendored = ["nettle-src"]
-+nettle-src = []
-diff --git a/build.rs b/build.rs
-index 44f7af3..ede4b2f 100644
---- a/build.rs
-+++ b/build.rs
-@@ -1,7 +1,5 @@
- extern crate bindgen;
- extern crate pkg_config;
--#[cfg(feature = "vendored")]
--extern crate nettle_src;
-
- use std::env;
- use std::fs;
-@@ -36,14 +34,6 @@ fn main() {
- println!("cargo:rerun-if-env-changed=NETTLE_STATIC");
- println!("cargo:rerun-if-env-changed={}", NETTLE_PREGENERATED_BINDINGS);
-
-- #[cfg(feature = "vendored")]
-- {
-- let artifacts = nettle_src::Build::new().build();
-- println!("cargo:vendored=1");
-- env::set_var("PKG_CONFIG_PATH",
-- artifacts.lib_dir().join("pkgconfig"));
-- }
--
- let nettle = pkg_config::probe_library("nettle hogweed").unwrap();
-
- let mode = match env::var_os("NETTLE_STATIC") {
--
cgit v1.2.3