From patchwork Sun Oct 29 04:27:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jaeme Sifat X-Patchwork-Id: 55505 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 5A40327BBE2; Sun, 29 Oct 2023 04:29:51 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,SPF_HELO_PASS, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id B5C7527BBEA for ; Sun, 29 Oct 2023 04:29:49 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qwxQd-0007n6-CP; Sun, 29 Oct 2023 00:29:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qwxQb-0007lc-N1 for guix-patches@gnu.org; Sun, 29 Oct 2023 00:29:33 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qwxQb-0004Xz-FY for guix-patches@gnu.org; Sun, 29 Oct 2023 00:29:33 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qwxR7-0001Ll-PI for guix-patches@gnu.org; Sun, 29 Oct 2023 00:30:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66805] [PATCH 13/22] gnu: Add rust-libgit2-sys-0.16. Resent-From: Jaeme Sifat Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 29 Oct 2023 04:30:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66805 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66805@debbugs.gnu.org Cc: Jaeme Sifat Received: via spool by 66805-submit@debbugs.gnu.org id=B66805.16985538005112 (code B ref 66805); Sun, 29 Oct 2023 04:30:05 +0000 Received: (at 66805) by debbugs.gnu.org; 29 Oct 2023 04:30:00 +0000 Received: from localhost ([127.0.0.1]:40148 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qwxR1-0001KN-9V for submit@debbugs.gnu.org; Sun, 29 Oct 2023 00:29:59 -0400 Received: from mailtransmit05.runbox.com ([2a0c:5a00:149::26]:52646) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qwxQy-0001K2-RN for 66805@debbugs.gnu.org; Sun, 29 Oct 2023 00:29:57 -0400 Received: from mailtransmit03.runbox ([10.9.9.163] helo=aibo.runbox.com) by mailtransmit05.runbox.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1qwxQM-00BUnN-Hd for 66805@debbugs.gnu.org; Sun, 29 Oct 2023 05:29:18 +0100 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=runbox.com; s=selector2; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To :Message-Id:Date:Subject:Cc:To:From; bh=+6R0bWVEUL8mIz2G277IRQo6l7AWRjzy5wTfeHRBrkU=; b=J2+9ZqjUBp4TSJqUXvg1mETOx6 9tMCs4De6/qnRfDstJzpCboglOVBRDOQ65oQAqRCq4i7mOlWIvdY/SaJSS2G6T5AoP3wz7GsHHe+V baNxKDZxywLHJfSRxa0p06zfaxjKg6jIxjY9PqMF/O4rLxQ3PFSLEzFjo0e48L/QejO0FwexebCDq efynXOSGqL2LNwR3or42yQAQJmyKTHdjd/KY4tXcaoXoY3pp+jzJ37GMdtpLMNhnTKCILN8DCnnN3 BleqYtvKvNwV9dphTRCxdG8UuHLyK8vD/E3moourUm/yMDxXm6Mqhz+XtZOczYWQWRgs8YgZgLMVk NDb9nU5g==; Received: from [10.9.9.73] (helo=submission02.runbox) by mailtransmit03.runbox with esmtp (Exim 4.86_2) (envelope-from ) id 1qwxQM-0005fU-AD for 66805@debbugs.gnu.org; Sun, 29 Oct 2023 05:29:18 +0100 Received: by submission02.runbox with esmtpsa [Authenticated ID (1176697)] (TLS1.2:ECDHE_SECP256R1__RSA_PSS_RSAE_SHA256__AES_256_GCM:256) (Exim 4.93) id 1qwxQB-001dmK-53; Sun, 29 Oct 2023 05:29:07 +0100 Date: Sun, 29 Oct 2023 00:27:05 -0400 Message-Id: <2f47ecaf487b3af1521f5edbe29e2f9909a9f52f.1698553237.git.jaeme@runbox.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Jaeme Sifat X-ACL-Warn: , Jaeme Sifat via Guix-patches X-Patchwork-Original-From: Jaeme Sifat via Guix-patches via From: Jaeme Sifat Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches This patch also adds gexps to the libgit2 snippet and cleans up the package definitions. * gnu/packages/crates-io.scm (rust-libgit2-sys-0.16): New variable. * gnu/packages/crates-io.scm (rust-libgit2-sys-0.6): Fix name field. Signed-off-by: Jaeme Sifat Change-Id: I8ebf29673c4f348171924ea1cc13d3baa0fdd3a7 --- gnu/packages/crates-io.scm | 166 +++++++++++++++++++------------------ 1 file changed, 87 insertions(+), 79 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 669baf7245..ab1641279c 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -37131,35 +37131,30 @@ (define-public rust-libfuzzer-sys-0.3 (license (list license:expat license:asl2.0 license:ncsa)))) -(define-public rust-libgit2-sys-0.14 +(define-public rust-libgit2-sys-0.16 (package (name "rust-libgit2-sys") - (version "0.14.2+1.5.1") + (version "0.16.1+1.7.1") (source (origin (method url-fetch) (uri (crate-uri "libgit2-sys" version)) - (file-name - (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 - "1926x5f84ykr8j2lsdmb0n0bj4jz173j5bm722cgwx8hnpv9agbz")) + (base32 "030dnq7hz79qs4rxdllc3ailvqzc432jwwxk7g8av55hh0vbp8pj")) (modules '((guix build utils))) - (snippet - '(begin (delete-file-recursively "libgit2"))))) + (snippet #~'(begin + (delete-file-recursively "libgit2"))))) (build-system cargo-build-system) (arguments - `(#:cargo-inputs - (("rust-cc" ,rust-cc-1) - ("rust-libc" ,rust-libc-0.2) - ("rust-libssh2-sys" ,rust-libssh2-sys-0.2) - ("rust-libz-sys" ,rust-libz-sys-1) - ("rust-openssl-sys" ,rust-openssl-sys-0.9) - ("rust-pkg-config" ,rust-pkg-config-0.3)))) - (native-inputs - (list pkg-config)) - (inputs - (list libgit2 openssl zlib)) + `(#:cargo-inputs (("rust-cc" ,rust-cc-1) + ("rust-libc" ,rust-libc-0.2) + ("rust-libssh2-sys" ,rust-libssh2-sys-0.3) + ("rust-libz-sys" ,rust-libz-sys-1) + ("rust-openssl-sys" ,rust-openssl-sys-0.9) + ("rust-pkg-config" ,rust-pkg-config-0.3)))) + (native-inputs (list pkg-config)) + (inputs (list libgit2 openssl zlib)) (home-page "https://github.com/rust-lang/git2-rs") (synopsis "Native bindings to the libgit2 library") (description @@ -37167,6 +37162,30 @@ (define-public rust-libgit2-sys-0.14 library.") (license (list license:expat license:asl2.0)))) +(define-public rust-libgit2-sys-0.14 + (package + (inherit rust-libgit2-sys-0.16) + (name "rust-libgit2-sys") + (version "0.14.2+1.5.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "libgit2-sys" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1926x5f84ykr8j2lsdmb0n0bj4jz173j5bm722cgwx8hnpv9agbz")) + (modules '((guix build utils))) + (snippet #~'(begin + (delete-file-recursively "libgit2"))))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-cc" ,rust-cc-1) + ("rust-libc" ,rust-libc-0.2) + ("rust-libssh2-sys" ,rust-libssh2-sys-0.2) + ("rust-libz-sys" ,rust-libz-sys-1) + ("rust-openssl-sys" ,rust-openssl-sys-0.9) + ("rust-pkg-config" ,rust-pkg-config-0.3)))))) + (define-public rust-libgit2-sys-0.13 (package (inherit rust-libgit2-sys-0.14) @@ -37176,24 +37195,20 @@ (define-public rust-libgit2-sys-0.13 (origin (method url-fetch) (uri (crate-uri "libgit2-sys" version)) - (file-name - (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 - "1fkdgfqdkd38hfsyw3znq629gp7wdknzslym5l0g29k9q83fmrai")) + (base32 "1fkdgfqdkd38hfsyw3znq629gp7wdknzslym5l0g29k9q83fmrai")) (modules '((guix build utils))) - (snippet - '(begin (delete-file-recursively "libgit2"))))) + (snippet #~'(begin + (delete-file-recursively "libgit2"))))) (arguments - `(#:cargo-inputs - (("rust-cc" ,rust-cc-1) - ("rust-libc" ,rust-libc-0.2) - ("rust-libssh2-sys" ,rust-libssh2-sys-0.2) - ("rust-libz-sys" ,rust-libz-sys-1) - ("rust-openssl-sys" ,rust-openssl-sys-0.9) - ("rust-pkg-config" ,rust-pkg-config-0.3)))) - (inputs - (list libgit2-1.4 openssl zlib)))) + `(#:cargo-inputs (("rust-cc" ,rust-cc-1) + ("rust-libc" ,rust-libc-0.2) + ("rust-libssh2-sys" ,rust-libssh2-sys-0.2) + ("rust-libz-sys" ,rust-libz-sys-1) + ("rust-openssl-sys" ,rust-openssl-sys-0.9) + ("rust-pkg-config" ,rust-pkg-config-0.3)))) + (inputs (list libgit2-1.4 openssl zlib)))) (define-public rust-libgit2-sys-0.12 (package @@ -37204,22 +37219,19 @@ (define-public rust-libgit2-sys-0.12 (origin (method url-fetch) (uri (crate-uri "libgit2-sys" version)) - (file-name - (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 - "153l8nvz9p8vyd5840xi6fwblvhpn3c33jwdwsznyq4f4jcwiq8r")) + (base32 "153l8nvz9p8vyd5840xi6fwblvhpn3c33jwdwsznyq4f4jcwiq8r")) (modules '((guix build utils))) - (snippet - '(begin (delete-file-recursively "libgit2"))))) + (snippet #~'(begin + (delete-file-recursively "libgit2"))))) (arguments - `(#:cargo-inputs - (("rust-cc" ,rust-cc-1) - ("rust-libc" ,rust-libc-0.2) - ("rust-libssh2-sys" ,rust-libssh2-sys-0.2) - ("rust-libz-sys" ,rust-libz-sys-1) - ("rust-openssl-sys" ,rust-openssl-sys-0.9) - ("rust-pkg-config" ,rust-pkg-config-0.3)))))) + `(#:cargo-inputs (("rust-cc" ,rust-cc-1) + ("rust-libc" ,rust-libc-0.2) + ("rust-libssh2-sys" ,rust-libssh2-sys-0.2) + ("rust-libz-sys" ,rust-libz-sys-1) + ("rust-openssl-sys" ,rust-openssl-sys-0.9) + ("rust-pkg-config" ,rust-pkg-config-0.3)))))) (define-public rust-libgit2-sys-0.10 (package @@ -37232,20 +37244,18 @@ (define-public rust-libgit2-sys-0.10 (uri (crate-uri "libgit2-sys" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 - "0l9fvki7qxsl97vgzqwlv75nl213a5vxw7b1jaik97ala356pv6r")) + (base32 "0l9fvki7qxsl97vgzqwlv75nl213a5vxw7b1jaik97ala356pv6r")) (modules '((guix build utils))) - (snippet - '(begin (delete-file-recursively "libgit2") #t)))) + (snippet #~'(begin + (delete-file-recursively "libgit2") #t)))) (arguments - `(#:cargo-inputs - (("rust-libc" ,rust-libc-0.2) - ("rust-libz-sys" ,rust-libz-sys-1) - ("rust-libssh2-sys" ,rust-libssh2-sys-0.2) - ("rust-openssl-sys" ,rust-openssl-sys-0.9) - ;; Build dependencies: - ("rust-cc" ,rust-cc-1) - ("rust-pkg-config" ,rust-pkg-config-0.3)))))) + `(#:cargo-inputs (("rust-libc" ,rust-libc-0.2) + ("rust-libz-sys" ,rust-libz-sys-1) + ("rust-libssh2-sys" ,rust-libssh2-sys-0.2) + ("rust-openssl-sys" ,rust-openssl-sys-0.9) + ;; Build dependencies: + ("rust-cc" ,rust-cc-1) + ("rust-pkg-config" ,rust-pkg-config-0.3)))))) (define-public rust-libgit2-sys-0.8 (package @@ -37253,21 +37263,20 @@ (define-public rust-libgit2-sys-0.8 (name "rust-libgit2-sys") (version "0.8.2") (source - (origin - (method url-fetch) - (uri (crate-uri "libgit2-sys" version)) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "0y2mibmx7wy91s2kmb2gfb29mrqlqaxpy5wcwr8s1lwws7b9w5sc")) - (modules '((guix build utils))) - (snippet - '(begin (delete-file-recursively "libgit2") #t)))))) + (origin + (method url-fetch) + (uri (crate-uri "libgit2-sys" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0y2mibmx7wy91s2kmb2gfb29mrqlqaxpy5wcwr8s1lwws7b9w5sc")) + (modules '((guix build utils))) + (snippet #~'(begin + (delete-file-recursively "libgit2") #t)))))) (define-public rust-libgit2-sys-0.6 (package (inherit rust-libgit2-sys-0.10) - (name "rust-libgit2-sys-6") + (name "rust-libgit2-sys") (version "0.6.19") (source (origin @@ -37277,15 +37286,14 @@ (define-public rust-libgit2-sys-0.6 (sha256 (base32 "0myk79sxqj20bmj4ir3p81xnma9qnid5rrmlbkj5v68wgdpfdskf")))) (arguments - `(#:cargo-inputs - (("rust-cc" ,rust-cc-1) - ("rust-cmake" ,rust-cmake-0.1) - ("rust-curl-sys" ,rust-curl-sys-0.4) - ("rust-libc" ,rust-libc-0.2) - ("rust-libssh2-sys" ,rust-libssh2-sys-0.2) - ("rust-libz-sys" ,rust-libz-sys-1) - ("rust-openssl-sys" ,rust-openssl-sys-0.9) - ("rust-pkg-config" ,rust-pkg-config-0.3)))))) + `(#:cargo-inputs (("rust-cc" ,rust-cc-1) + ("rust-cmake" ,rust-cmake-0.1) + ("rust-curl-sys" ,rust-curl-sys-0.4) + ("rust-libc" ,rust-libc-0.2) + ("rust-libssh2-sys" ,rust-libssh2-sys-0.2) + ("rust-libz-sys" ,rust-libz-sys-1) + ("rust-openssl-sys" ,rust-openssl-sys-0.9) + ("rust-pkg-config" ,rust-pkg-config-0.3)))))) (define-public rust-libloading-0.7 (package