From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id 0IeoGLIW9V5gfQAA0tVLHw (envelope-from ) for ; Thu, 25 Jun 2020 21:27:14 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id 0COnFLIW9V4FeQAAB5/wlQ (envelope-from ) for ; Thu, 25 Jun 2020 21:27:14 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id D82059401CB for ; Thu, 25 Jun 2020 21:27:13 +0000 (UTC) Received: from localhost ([::1]:44474 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1joZOq-0002UP-Rl for larch@yhetil.org; Thu, 25 Jun 2020 17:27:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51640) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1joZOg-0002KO-Mx for guix-patches@gnu.org; Thu, 25 Jun 2020 17:27:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:58092) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1joZOg-0004Up-Ds for guix-patches@gnu.org; Thu, 25 Jun 2020 17:27:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1joZOg-0002r3-AK for guix-patches@gnu.org; Thu, 25 Jun 2020 17:27:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#42049] [PATCH 2/4] gnu: crates-io: Use propagated-inputs and propagated-native-inputs. References: <20200625212523.25016-1-kuba@kadziolka.net> In-Reply-To: <20200625212523.25016-1-kuba@kadziolka.net> Resent-From: Jakub =?UTF-8?Q?K=C4=85dzio=C5=82ka?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 25 Jun 2020 21:27:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 42049 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 42049@debbugs.gnu.org Received: via spool by 42049-submit@debbugs.gnu.org id=B42049.159312039810907 (code B ref 42049); Thu, 25 Jun 2020 21:27:02 +0000 Received: (at 42049) by debbugs.gnu.org; 25 Jun 2020 21:26:38 +0000 Received: from localhost ([127.0.0.1]:41398 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1joZOH-0002pq-Hk for submit@debbugs.gnu.org; Thu, 25 Jun 2020 17:26:38 -0400 Received: from pat.zlotemysli.pl ([37.59.186.212]:49912) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1joZOE-0002pg-NT for 42049@debbugs.gnu.org; Thu, 25 Jun 2020 17:26:36 -0400 Received: (qmail 32476 invoked by uid 1009); 25 Jun 2020 23:26:33 +0200 Received: from 188.123.215.55 (kuba@kadziolka.net@188.123.215.55) by pat.zlotemysli.pl (envelope-from , uid 1002) with qmail-scanner-2.08st (clamdscan: 0.98.6/25853. spamassassin: 3.4.0. perlscan: 2.08st. Clear:RC:1(188.123.215.55):. Processed in 0.068464 secs); 25 Jun 2020 21:26:33 -0000 Received: from unknown (HELO localhost.localdomain) (kuba@kadziolka.net@188.123.215.55) by pat.zlotemysli.pl with AES256-SHA encrypted SMTP; 25 Jun 2020 23:26:33 +0200 From: Jakub =?UTF-8?Q?K=C4=85dzio=C5=82ka?= Date: Thu, 25 Jun 2020 23:26:32 +0200 Message-Id: <20200625212632.25840-1-kuba@kadziolka.net> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Qmailux-2.08st: added fake Content-Type header Content-Type: text/plain X-Spam-Score: 0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -0.3 (/) X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Spam-Score: 2.49 X-TUID: uvm8eqHt4IA8 * gnu/packages/crates-io.scm (rust-curl-sys-0.4, rust-freetype-rs-0.23, rust-freetype-sys-0.9, rust-git2-0.11, rust-grep-pcre2-0.1, rust-libgit2-sys-0.10, rust-libz-sys-1.0, rust-libssh2-sys-0.2, rust-pcre2-0.2, rust-pcre2-sys-0.2, rust-servo-fontconfig-0.4, rust-servo-fontconfig-sys-4): Don't include transitive dependencies in inputs. (rust-capnp-rpc-0.10, rust-expat-sys-2.1, rust-libz-sys-1.0, rust-pcre2-sys-0.2, rust-pkg-config-0.3, rust-servo-fontconfig-sys-4): Make inputs propagated. (rust-flate2-1.0, rust-grep-0.2): Don't skip build. * gnu/packages/rust-apps.scm (exa, ripgrep): Don't include some transitive dependencies in inputs. * gnu/packages/sequoia.scm (sequoia): Likewise. --- gnu/packages/crates-io.scm | 83 ++++++++++++-------------------------- gnu/packages/rust-apps.scm | 9 +---- gnu/packages/sequoia.scm | 3 +- 3 files changed, 29 insertions(+), 66 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index bc29df5871..5a4b513f1a 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -2482,15 +2482,15 @@ messages.") (sha256 (base32 "1j6xg7yays1hlm1045wviyn1642yvvi2p4kba26yk07a0kafr3jn")))) (build-system cargo-build-system) - (native-inputs - `(("capnproto" ,capnproto))) (arguments `(#:cargo-inputs (("rust-capnp" ,rust-capnp-0.10) ("rust-capnp-futures" ,rust-capnp-futures-0.10) ("rust-futures" ,rust-futures-0.1)) #:cargo-development-inputs - (("rust-capnpc" ,rust-capnpc-0.10)))) + (("rust-capnpc" ,rust-capnpc-0.10)) + #:propagated-native-inputs + (("capnproto" ,capnproto)))) (home-page "https://github.com/capnproto/capnproto-rust") (synopsis "Cap'n Proto remote procedure call protocol implementation") (description "This package provides an implementation of the Cap'n Proto @@ -4659,13 +4659,10 @@ Transparency logs for use with sct crate.") (let ((openssl (assoc-ref inputs "openssl"))) (setenv "OPENSSL_DIR" openssl)) #t))))) - (native-inputs - `(("pkg-config" ,pkg-config))) (inputs `(("curl" ,curl) ("nghttp2" ,nghttp2) - ("openssl" ,openssl) - ("zlib" ,zlib))) + ("openssl" ,openssl))) (home-page "https://github.com/alexcrichton/curl-rust") (synopsis "Native bindings to the libcurl library") (description @@ -6341,10 +6338,10 @@ variables.") (arguments `(#:cargo-inputs (("rust-cmake" ,rust-cmake-0.1) - ("rust-pkg-config" ,rust-pkg-config-0.3)))) - (native-inputs - `(("pkg-config" ,pkg-config))) - (inputs + ("rust-pkg-config" ,rust-pkg-config-0.3)) + #:propagated-native-inputs + (("pkg-config" ,pkg-config)))) + (propagated-inputs `(("expat" ,expat))) (home-page "http://www.libexpat.org/") (synopsis "XML parser library written in C") @@ -6663,8 +6660,7 @@ cross platform API.") "0hlb2zmn5ixrgr0i1qvrd3a7j4fpp002d0kddn2hm7hjj49z9zrc")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-cfg-if" ,rust-cfg-if-0.1) ("rust-cloudflare-zlib-sys" ,rust-cloudflare-zlib-sys-0.2) @@ -7014,9 +7010,6 @@ values to other threads.") ("rust-libc" ,rust-libc-0.2)) #:cargo-development-inputs (("rust-unicode-normalization" ,rust-unicode-normalization-0.1)))) - (inputs - `(("freetype" ,freetype) - ("zlib" ,zlib))) (home-page "https://github.com/PistonDevelopers/freetype-rs") (synopsis "Bindings for FreeType font library") (description "This package provides bindings for FreeType font library.") @@ -7041,9 +7034,8 @@ values to other threads.") (("rust-libc" ,rust-libc-0.2) ("rust-libz-sys" ,rust-libz-sys-1.0) ("rust-pkg-config" ,rust-pkg-config-0.3)))) - (inputs - `(("freetype" ,freetype) - ("zlib" ,zlib))) + (propagated-inputs + `(("freetype" ,freetype))) (home-page "https://github.com/PistonDevelopers/freetype-sys") (synopsis "Low level binding for FreeType font library") (description @@ -8484,9 +8476,7 @@ DWARF debugging format.") (native-inputs `(("libgit2" ,libgit2) ("libssh2" ,libssh2) - ("openssl" ,openssl) - ("pkg-config" ,pkg-config) - ("zlib" ,zlib))) + ("openssl" ,openssl))) (home-page "https://github.com/rust-lang/git2-rs") (synopsis "Rust bindings to libgit2") (description @@ -9164,8 +9154,7 @@ loading crate.") "0s3y1rx94swqnciz2zzifm8pmy2iyck270skgxhgkq7ab6x96bjq")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-grep-cli" ,rust-grep-cli-0.1) ("rust-grep-matcher" ,rust-grep-matcher-0.1) ("rust-grep-pcre2" ,rust-grep-pcre2-0.1) @@ -9259,9 +9248,6 @@ the regex engine it uses pluggable.") `(#:cargo-inputs (("rust-grep-matcher" ,rust-grep-matcher-0.1) ("rust-pcre2" ,rust-pcre2-0.2)))) - (native-inputs - `(("pcre2" ,pcre2) - ("pkg-config" ,pkg-config))) (home-page "https://github.com/BurntSushi/ripgrep") (synopsis "Use PCRE2 with the grep crate") @@ -11419,9 +11405,7 @@ macros on libc without stdlib.") #t))))) (native-inputs `(("libgit2" ,libgit2) - ("openssl" ,openssl) - ("pkg-config" ,pkg-config) - ("zlib" ,zlib))) + ("openssl" ,openssl))) (home-page "https://github.com/rust-lang/git2-rs") (synopsis "Native bindings to the libgit2 library") (description @@ -11639,10 +11623,9 @@ functions and static variables these libraries contain.") ;; Build dependencies: ("rust-cc" ,rust-cc-1.0) ("rust-pkg-config" ,rust-pkg-config-0.3) - ("rust-vcpkg" ,rust-vcpkg-0.2)))) - (native-inputs - `(("pkg-config" ,pkg-config) - ("zlib" ,zlib))) + ("rust-vcpkg" ,rust-vcpkg-0.2)) + #:propagated-native-inputs + (("zlib" ,zlib)))) (home-page "https://github.com/rust-lang/libz-sys") (synopsis "Bindings to the system libz library") (description @@ -11810,9 +11793,7 @@ pairs in insertion order.") #t))))) (native-inputs `(("libssh2" ,libssh2) - ("openssl" ,openssl) - ("pkg-config" ,pkg-config) - ("zlib" ,zlib))) + ("openssl" ,openssl))) (home-page "https://github.com/alexcrichton/ssh2-rs") (synopsis "Native bindings to the libssh2 library") (description @@ -15558,9 +15539,6 @@ synchronization primitives.") ("rust-log" ,rust-log-0.4) ("rust-pcre2-sys" ,rust-pcre2-sys-0.2) ("rust-thread-local" ,rust-thread-local-1.0)))) - (native-inputs - `(("pcre2" ,pcre2) - ("pkg-config" ,pkg-config))) (home-page "https://github.com/BurntSushi/rust-pcre2") (synopsis "High level wrapper library for PCRE2") (description @@ -15588,10 +15566,9 @@ synchronization primitives.") `(#:cargo-inputs (("rust-libc" ,rust-libc-0.2) ("rust-pkg-config" ,rust-pkg-config-0.3) - ("rust-cc" ,rust-cc-1.0)))) - (native-inputs - `(("pcre2" ,pcre2) - ("pkg-config" ,pkg-config))) + ("rust-cc" ,rust-cc-1.0)) + #:propagated-native-inputs + (("pcre2" ,pcre2)))) (home-page "https://github.com/BurntSushi/rust-pcre2") (synopsis "Low level bindings to PCRE2") @@ -16509,9 +16486,9 @@ written with declarative macros.") (build-system cargo-build-system) (arguments `(#:cargo-development-inputs - (("rust-lazy-static" ,rust-lazy-static-1)))) - (native-inputs - `(("pkg-config" ,pkg-config))) + (("rust-lazy-static" ,rust-lazy-static-1)) + #:propagated-native-inputs + (("pkg-config" ,pkg-config)))) (home-page "https://github.com/rust-lang/pkg-config-rs") (synopsis "Library to run the pkg-config system tool") (description @@ -20969,10 +20946,6 @@ for the serde framework.") `(#:cargo-inputs (("rust-libc" ,rust-libc-0.2) ("rust-servo-fontconfig-sys" ,rust-servo-fontconfig-sys-4)))) - (native-inputs - `(("pkg-config" ,pkg-config))) - (inputs - `(("fontconfig" ,fontconfig))) (home-page "https://github.com/servo/rust-fontconfig/") (synopsis "Rust bindings for fontconfig") (description "This package provides Rust bindings for fontconfig.") @@ -21003,9 +20976,7 @@ for the serde framework.") (("rust-expat-sys" ,rust-expat-sys-2.1) ("rust-servo-freetype-sys" ,rust-servo-freetype-sys-4) ("rust-pkg-config" ,rust-pkg-config-0.3)))) - (native-inputs - `(("pkg-config" ,pkg-config))) - (inputs + (propagated-inputs `(("fontconfig" ,fontconfig))) (home-page "https://crates.io/crates/servo-fontconfig-sys") (synopsis "Rust wrapper around Fontconfig") @@ -21034,9 +21005,7 @@ for the serde framework.") `(#:cargo-inputs (("rust-cmake" ,rust-cmake-0.1) ("rust-pkg-config" ,rust-pkg-config-0.3)))) - (native-inputs - `(("pkg-config" ,pkg-config))) - (inputs + (propagated-inputs `(("freetype" ,freetype))) (home-page "http://www.freetype.org/") (synopsis "Rust wrapper around freetype") diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm index 1cf22f4a79..9c03b90f9c 100644 --- a/gnu/packages/rust-apps.scm +++ b/gnu/packages/rust-apps.scm @@ -120,10 +120,7 @@ (string-append share "/zsh/site-functions/_exa")) #t)))))) (inputs - `(("libgit2" ,libgit2) - ("zlib" ,zlib))) - (native-inputs - `(("pkg-config" ,pkg-config))) + `(("libgit2" ,libgit2))) (home-page "https://the.exa.website/") (synopsis "Modern replacement for ls") (description "@code{exa} is a modern replacement for the command-line @@ -251,9 +248,7 @@ provides defaults for 80% of the use cases.") #t))) #:features '("pcre2"))) (native-inputs - `(("asciidoc" ,asciidoc) - ("pcre2" ,pcre2) - ("pkg-config" ,pkg-config))) + `(("asciidoc" ,asciidoc))) (home-page "https://github.com/BurntSushi/ripgrep") (synopsis "Line-oriented search tool") (description diff --git a/gnu/packages/sequoia.scm b/gnu/packages/sequoia.scm index 554b1d65ea..06ccd6aa78 100644 --- a/gnu/packages/sequoia.scm +++ b/gnu/packages/sequoia.scm @@ -57,8 +57,7 @@ ("python-pytest" ,python-pytest) ("python-pytest-runner" ,python-pytest-runner))) (inputs - `(("capnproto" ,capnproto) - ("gmp" ,gmp) + `(("gmp" ,gmp) ("nettle" ,nettle) ("openssl" ,openssl) ("python" ,python) -- 2.26.2