all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Efraim Flashner <efraim@flashner.co.il>
To: Hartmut Goebel <h.goebel@crazy-compilers.com>
Cc: 40874@debbugs.gnu.org
Subject: [bug#40874] [PATCH v2 3/3] gnu: Add rust-nettle-7.
Date: Mon, 4 May 2020 19:10:14 +0300	[thread overview]
Message-ID: <20200504161014.GE1920@E5400> (raw)
In-Reply-To: <d691b0f6a3ca099441ae2fb7763fdd706c086458.1588604978.git.h.goebel@crazy-compilers.com>

[-- Attachment #1: Type: text/plain, Size: 4861 bytes --]

I would personally do this one with a snippet since its one line but
looks good.

On Mon, May 04, 2020 at 05:11:19PM +0200, Hartmut Goebel wrote:
> * gnu/packages/crates-io.scm (rust-nettle-7): New variable.
> * gnu/packages/patches/rust-nettle-disable-vendor.patch: New file.
> * gnu/local.mk: Add it.
> ---
>  gnu/local.mk                                  |  1 +
>  gnu/packages/crates-io.scm                    | 44 +++++++++++++++++++
>  .../patches/rust-nettle-disable-vendor.patch  | 13 ++++++
>  3 files changed, 58 insertions(+)
>  create mode 100644 gnu/packages/patches/rust-nettle-disable-vendor.patch
> 
> diff --git a/gnu/local.mk b/gnu/local.mk
> index f7ffe75eb3..383f867426 100644
> --- a/gnu/local.mk
> +++ b/gnu/local.mk
> @@ -1425,6 +1425,7 @@ dist_patch_DATA =						\
>    %D%/packages/patches/rust-1.25-accept-more-detailed-gdb-lines.patch \
>    %D%/packages/patches/rust-bootstrap-stage0-test.patch		\
>    %D%/packages/patches/rust-coresimd-doctest.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		 \
>    %D%/packages/patches/rust-openssl-sys-no-vendor.patch	\
> diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
> index 16855a8bff..e1c971e76e 100644
> --- a/gnu/packages/crates-io.scm
> +++ b/gnu/packages/crates-io.scm
> @@ -37,6 +37,7 @@
>    #:use-module (gnu packages gtk)
>    #:use-module (gnu packages jemalloc)
>    #:use-module (gnu packages llvm)
> +  #:use-module (gnu packages multiprecision)
>    #:use-module (gnu packages nettle)
>    #:use-module (gnu packages pcre)
>    #:use-module (gnu packages pkg-config)
> @@ -11943,6 +11944,49 @@ types as proposed in RFC 1158.")
>      (license (list license:asl2.0
>                     license:expat))))
>  
> +(define-public rust-nettle-7
> +  (package
> +    (name "rust-nettle")
> +    (version "7.0.0")
> +    (source
> +     (origin
> +       (method url-fetch)
> +       (uri (crate-uri "nettle" version))
> +       (file-name (string-append name "-" version ".tar.gz"))
> +       (sha256
> +        (base32 "1n6dwy9zba8853bmxzhwaashd3np0wxpx0pj43brm0hb8n2sxbxi"))
> +       (patches (search-patches "rust-nettle-disable-vendor.patch"))))
> +    (build-system cargo-build-system)
> +    (native-inputs
> +     `(("pkg-config" ,pkg-config)))
> +    (inputs
> +     `(("clang" ,clang)
> +       ("gmp" ,gmp)
> +       ("nettle" ,nettle)))
> +    (arguments
> +     `(#:skip-build? #t ;; provides nothing, has no tests
> +       #:cargo-inputs
> +       (("rust-getrandom" ,rust-getrandom-0.1)
> +        ("rust-libc" ,rust-libc-0.2)
> +        ("rust-nettle-sys" ,rust-nettle-sys-2)
> +        ("rust-thiserror" ,rust-thiserror-1.0))
> +       #:cargo-development-inputs
> +       (("rust-bindgen" ,rust-bindgen-0.51)
> +        ("rust-pkg-config" ,rust-pkg-config-0.3))
> +       #:phases
> +       (modify-phases %standard-phases
> +         (add-after 'unpack 'set-missing-env-vars
> +           (lambda* (#:key inputs #:allow-other-keys)
> +             ;; FIXME: why do we need to set this?
> +             (setenv "LIBCLANG_PATH"
> +                     (string-append (assoc-ref inputs "clang") "/lib"))
> +             #t)))))
> +    (home-page "https://gitlab.com/sequoia-pgp/nettle-rs")
> +  (synopsis "Rust bindings for the Nettle cryptographic library")
> +  (description "This package provides Rust bindings for the Nettle
> +cryptographic library.")
> +  (license (list license:lgpl3 license:gpl2 license:gpl3))))
> +
>  (define-public rust-nettle-sys-2
>    (package
>      (name "rust-nettle-sys")
> diff --git a/gnu/packages/patches/rust-nettle-disable-vendor.patch b/gnu/packages/patches/rust-nettle-disable-vendor.patch
> new file mode 100644
> index 0000000000..5b52821cdb
> --- /dev/null
> +++ b/gnu/packages/patches/rust-nettle-disable-vendor.patch
> @@ -0,0 +1,13 @@
> +Subject: nettle: 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/b608e6beaa1d38c14fc16ad53780d94954a91900
> +https://sources.debian.org/src/rust-nettle/7.0.0-1/debian/patches/disable-vendor.diff/
> +--- a/Cargo.toml	1969-12-31 19:00:00.000000000 -0500
> ++++ b/Cargo.toml	2019-10-23 19:12:01.076181971 -0400
> +@@ -35,4 +35,4 @@
> + version = "1"
> + 
> + [features]
> +-vendored = ["nettle-sys/vendored"]
> ++vendored = []
> -- 
> 2.21.3
> 

-- 
Efraim Flashner   <efraim@flashner.co.il>   אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

  reply	other threads:[~2020-05-04 16:55 UTC|newest]

Thread overview: 107+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-04-26 16:44 [bug#40874] [PATCH 00/94] Add sequoia pgp, rust-nettle, and 90 rust package Hartmut Goebel
2020-04-26 16:44 ` [bug#40874] [PATCH 01/94] gnu: Update rust-failure-0.1 to 0.1.7 Hartmut Goebel
2020-04-26 16:44 ` [bug#40874] [PATCH 02/94] gnu: Update rust-failure-derive-0.1 " Hartmut Goebel
2020-04-26 16:44 ` [bug#40874] [PATCH 03/94] gnu: Update rust-unicode-normalization-0.1 to 0.1.9 Hartmut Goebel
2020-04-26 16:44 ` [bug#40874] [PATCH 04/94] gnu: Update rust-wasm-bindgen-futures-0.3 to 0.3.27 Hartmut Goebel
2020-04-26 16:44 ` [bug#40874] [PATCH 05/94] gnu: Update rust-wasm-bindgen-test-0.2 to 0.2.50 Hartmut Goebel
2020-04-26 16:44 ` [bug#40874] [PATCH 06/94] gnu: Update rust-syn-1.0 to 1.0.17 Hartmut Goebel
2020-04-26 16:44 ` [bug#40874] [PATCH 07/94] gnu: Replace rust-synstructure-0.10 by 0.12.3 Hartmut Goebel
2020-04-26 16:44 ` [bug#40874] [PATCH 08/94] gnu: Add rust-ascii-canvas-2 Hartmut Goebel
2020-04-26 16:44 ` [bug#40874] [PATCH 09/94] gnu: Add rust-assert-cli-0.6 Hartmut Goebel
2020-04-26 16:44 ` [bug#40874] [PATCH 10/94] gnu: Add rust-base64-0.9 Hartmut Goebel
2020-04-26 16:44 ` [bug#40874] [PATCH 11/94] gnu: Add rust-bindgen-0.51 Hartmut Goebel
2020-04-26 16:44 ` [bug#40874] [PATCH 12/94] gnu: Add rust-bindgen-0.49 Hartmut Goebel
2020-04-26 16:44 ` [bug#40874] [PATCH 13/94] gnu: Add rust-bitflags-0.5 Hartmut Goebel
2020-04-26 16:44 ` [bug#40874] [PATCH 14/94] gnu: Add rust-bytes-0.5 Hartmut Goebel
2020-04-26 16:44 ` [bug#40874] [PATCH 15/94] gnu: Add rust-capnp-0.10 Hartmut Goebel
2020-04-26 16:44 ` [bug#40874] [PATCH 16/94] gnu: Add rust-capnpc-0.10 Hartmut Goebel
2020-04-26 16:44 ` [bug#40874] [PATCH 17/94] gnu: Add rust-capnp-futures-0.10 Hartmut Goebel
2020-04-26 16:44 ` [bug#40874] [PATCH 18/94] gnu: Add rust-capnp-rpc-0.10 Hartmut Goebel
2020-04-26 16:44 ` [bug#40874] [PATCH 19/94] gnu: Add rust-colored-1 Hartmut Goebel
2020-04-26 16:44 ` [bug#40874] [PATCH 20/94] gnu: Add rust-crossterm-winapi-0.4 Hartmut Goebel
2020-04-26 16:45 ` [bug#40874] [PATCH 21/94] gnu: Add rust-crossterm-0.13 Hartmut Goebel
2020-04-26 16:45 ` [bug#40874] [PATCH 22/94] gnu: Add rust-ctor-0.1 Hartmut Goebel
2020-04-26 16:45 ` [bug#40874] [PATCH 23/94] gnu: Add rust-ct-logs-0.3 Hartmut Goebel
2020-04-26 16:45 ` [bug#40874] [PATCH 24/94] gnu: Add rust-derive-new-0.5 Hartmut Goebel
2020-04-26 16:45 ` [bug#40874] [PATCH 25/94] gnu: Add rust-derive-builder-0.5 Hartmut Goebel
2020-04-26 16:45 ` [bug#40874] [PATCH 26/94] gnu: Add rust-derive-builder-core-0.2 Hartmut Goebel
2020-04-26 16:45 ` [bug#40874] [PATCH 27/94] gnu: Add rust-difference-1 Hartmut Goebel
2020-04-26 16:45 ` [bug#40874] [PATCH 28/94] gnu: Add rust-docmatic-0.1 Hartmut Goebel
2020-04-26 16:45 ` [bug#40874] [PATCH 29/94] gnu: Add rust-dogged-0.2 Hartmut Goebel
2020-04-26 16:45 ` [bug#40874] [PATCH 30/94] gnu: Add rust-docopt-0.8 Hartmut Goebel
2020-04-26 16:45 ` [bug#40874] [PATCH 31/94] gnu. Add rust-ena-0.13 Hartmut Goebel
2020-04-26 16:45 ` [bug#40874] [PATCH 32/94] gnu: Add rust-environment-0.1 Hartmut Goebel
2020-04-26 16:45 ` [bug#40874] [PATCH 33/94] gnu: Add rust-expectest-0.9 Hartmut Goebel
2020-04-26 16:45 ` [bug#40874] [PATCH 34/94] gnu: Add rust-fallible-streaming-iterator-0.1 Hartmut Goebel
2020-04-26 16:45 ` [bug#40874] [PATCH 35/94] gnu: Add rust-futures-timer-0.1 Hartmut Goebel
2020-04-26 16:45 ` [bug#40874] [PATCH 36/94] gnu: Add rust-fs2-0.4 Hartmut Goebel
2020-04-26 16:45 ` [bug#40874] [PATCH 37/94] gnu: Add rust-h2-0.1 Hartmut Goebel
2020-04-26 16:45 ` [bug#40874] [PATCH 38/94] gnu: Add rust-hex-0.2 Hartmut Goebel
2020-04-26 16:45 ` [bug#40874] [PATCH 39/94] gnu: Add rust-http-0.2 Hartmut Goebel
2020-04-26 16:45 ` [bug#40874] [PATCH 40/94] gnu: Add rust-http-body-0.3 Hartmut Goebel
2020-04-26 16:45 ` [bug#40874] [PATCH 41/94] gnu: Add rust-http-body-0.1 Hartmut Goebel
2020-04-26 16:45 ` [bug#40874] [PATCH 42/94] gnu: Add rust-hyper-0.12 Hartmut Goebel
2020-04-26 16:45 ` [bug#40874] [PATCH 43/94] gnu: Add rust-hyper-tls-0.3 Hartmut Goebel
2020-04-26 16:45 ` [bug#40874] [PATCH 44/94] gnu: Add rust-lalrpop-util-0.17 Hartmut Goebel
2020-04-26 16:45 ` [bug#40874] [PATCH 45/94] gnu: Add rust-lalrpop-0.17 Hartmut Goebel
2020-04-26 16:45 ` [bug#40874] [PATCH 46/94] gnu: Add rust-libc-print-0.1 Hartmut Goebel
2020-04-26 16:45 ` [bug#40874] [PATCH 47/94] gnu: Add rust-libsqlite3-sys-0.15 Hartmut Goebel
2020-04-26 16:45 ` [bug#40874] [PATCH 48/94] gnu: Add rust-loom-0.2 Hartmut Goebel
2020-04-26 16:45 ` [bug#40874] [PATCH 49/94] gnu: Add rust-loom-0.3 Hartmut Goebel
2020-04-26 16:45 ` [bug#40874] [PATCH 50/94] gnu: Add rust-lru-cache-0.1 Hartmut Goebel
2020-04-26 16:45 ` [bug#40874] [PATCH 51/94] gnu: Add rust-mach-o-sys-0.1 Hartmut Goebel
2020-04-26 16:45 ` [bug#40874] [PATCH 52/94] gnu: Add rust-memsec-0.5 Hartmut Goebel
2020-04-26 16:45 ` [bug#40874] [PATCH 53/94] gnu: Add rust-parity-tokio-ipc-0.4 Hartmut Goebel
2020-04-26 16:45 ` [bug#40874] [PATCH 54/94] gnu: Add rust-pin-project-lite-0.1 Hartmut Goebel
2020-04-26 16:45 ` [bug#40874] [PATCH 55/94] gnu: Add rust-prettytable-rs-0.8 Hartmut Goebel
2020-04-26 16:45 ` [bug#40874] [PATCH 56/94] gnu: Add rust-pretty-assertions-0.2 Hartmut Goebel
2020-04-26 16:45 ` [bug#40874] [PATCH 57/94] gnu: Add rust-pretty-env-logger-0.3 Hartmut Goebel
2020-04-26 16:45 ` [bug#40874] [PATCH 58/94] gnu: Add rust-pulldown-cmark-0.0.8 Hartmut Goebel
2020-04-26 16:45 ` [bug#40874] [PATCH 59/94] gnu: Add rust-rayon-0.8 Hartmut Goebel
2020-04-26 16:45 ` [bug#40874] [PATCH 60/94] gnu: Add rust-ring-0.16 Hartmut Goebel
2020-04-26 16:45 ` [bug#40874] [PATCH 61/94] gnu: Add rust-ring-0.13 Hartmut Goebel
2020-04-26 16:45 ` [bug#40874] [PATCH 62/94] gnu: Add rust-rpassword-4 Hartmut Goebel
2020-04-26 16:45 ` [bug#40874] [PATCH 63/94] gnu: Add rust-rspec-1 Hartmut Goebel
2020-04-26 16:45 ` [bug#40874] [PATCH 64/94] gnu: Add rust-rusqlite-0.19 Hartmut Goebel
2020-04-26 16:45 ` [bug#40874] [PATCH 65/94] gnu: Add rust-rustls-0.16 Hartmut Goebel
2020-04-26 16:45 ` [bug#40874] [PATCH 66/94] gnu: Add rust-rustls-0.12 Hartmut Goebel
2020-04-26 16:45 ` [bug#40874] [PATCH 67/94] gnu: Add rust-sct-0.6 Hartmut Goebel
2020-04-26 16:45 ` [bug#40874] [PATCH 68/94] gnu: Add rust-sct-0.3 Hartmut Goebel
2020-04-26 16:45 ` [bug#40874] [PATCH 69/94] gnu: Add rust-sha2-asm-0.5 Hartmut Goebel
2020-04-26 16:45 ` [bug#40874] [PATCH 70/94] gnu: Add rust-sha2-0.8 Hartmut Goebel
2020-04-26 16:45 ` [bug#40874] [PATCH 71/94] gnu: Add rust-skeptic-0.9 Hartmut Goebel
2020-04-26 16:45 ` [bug#40874] [PATCH 72/94] gnu: Add rust-spmc-0.3 Hartmut Goebel
2020-04-26 16:45 ` [bug#40874] [PATCH 73/94] gnu: Add rust-string-0.2 Hartmut Goebel
2020-04-26 16:45 ` [bug#40874] [PATCH 74/94] gnu: Add rust-term-0.2 Hartmut Goebel
2020-04-26 16:45 ` [bug#40874] [PATCH 75/94] gnu: Add rust-tokio-0.2 Hartmut Goebel
2020-04-26 16:45 ` [bug#40874] [PATCH 76/94] gnu: Add rust-tokio-buf-0.1 Hartmut Goebel
2020-04-26 16:45 ` [bug#40874] [PATCH 77/94] gnu: Add rust-tokio-macros-0.2 Hartmut Goebel
2020-04-26 16:45 ` [bug#40874] [PATCH 78/94] gnu: Add rust-tokio-named-pipes-0.1 Hartmut Goebel
2020-04-26 16:45 ` [bug#40874] [PATCH 79/94] gnu: Add rust-tokio-mockstream-1 Hartmut Goebel
2020-04-26 16:45 ` [bug#40874] [PATCH 80/94] gnu: Add rust-tokio-rustls-0.12 Hartmut Goebel
2020-04-26 16:46 ` [bug#40874] [PATCH 81/94] gnu: Add rust-tokio-test-0.2 Hartmut Goebel
2020-04-26 16:46 ` [bug#40874] [PATCH 82/94] gnu: Add rust-untrusted-0.6 Hartmut Goebel
2020-04-26 16:46 ` [bug#40874] [PATCH 83/94] gnu: Add rust-want-0.2 Hartmut Goebel
2020-04-26 16:46 ` [bug#40874] [PATCH 84/94] gnu: Add rust-webpki-0.21 Hartmut Goebel
2020-04-26 16:46 ` [bug#40874] [PATCH 85/94] gnu: Add rust-webpki-0.18 Hartmut Goebel
2020-04-26 16:46 ` [bug#40874] [PATCH 86/94] gnu: Add rust-webpki-roots-0.18 Hartmut Goebel
2020-04-26 16:46 ` [bug#40874] [PATCH 87/94] gnu: Add rust-webpki-roots-0.17 Hartmut Goebel
2020-04-26 16:46 ` [bug#40874] [PATCH 88/94] gnu: Add rust-webpki-roots-0.14 Hartmut Goebel
2020-04-26 16:46 ` [bug#40874] [PATCH 89/94] gnu: Add rust-which-3 Hartmut Goebel
2020-04-26 16:46 ` [bug#40874] [PATCH 90/94] gnu: Add rust-zbase32-0.1 Hartmut Goebel
2020-04-26 16:46 ` [bug#40874] [PATCH 91/94] gnu: Add nettle-src Hartmut Goebel
2020-04-26 16:46 ` [bug#40874] [PATCH 92/94] gnu: Add rust-nettle-sys-2 Hartmut Goebel
2020-04-26 16:46 ` [bug#40874] [PATCH 93/94] gnu: Add rust-nettle-7 Hartmut Goebel
2020-05-04  8:59   ` Efraim Flashner
2020-05-04 10:47     ` Hartmut Goebel
2020-05-04 10:59       ` Efraim Flashner
2020-05-04 15:14         ` Hartmut Goebel
2020-05-04 15:11   ` [bug#40874] [PATCH v2 2/3] gnu: Add rust-nettle-sys-2 Hartmut Goebel
2020-05-04 15:11   ` [bug#41079] [PATCH v2 3/3] gnu: Add rust-nettle-7 Hartmut Goebel
2020-05-04 16:10     ` Efraim Flashner [this message]
2020-05-05 11:57       ` bug#40874: " Hartmut Goebel
2020-04-26 16:46 ` [bug#40874] [PATCH 94/94] gnu: Add sequoia Hartmut Goebel
2020-04-30 22:54 ` [bug#40874] [PATCH 00/94] Add sequoia pgp, rust-nettle, and 90 rust package Ludovic Courtès
2020-05-01 19:50   ` Christopher Baines
2020-05-02 18:30     ` Hartmut Goebel
2020-05-02 22:15       ` Ludovic Courtès

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200504161014.GE1920@E5400 \
    --to=efraim@flashner.co.il \
    --cc=40874@debbugs.gnu.org \
    --cc=h.goebel@crazy-compilers.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.