From patchwork Fri Jan 31 21:10:28 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Herman Rimm X-Patchwork-Id: 38065 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 34A5727BBEC; Fri, 31 Jan 2025 21:18:24 +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=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,TVD_SPACE_RATIO,URIBL_BLOCKED autolearn=ham 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 DA6B027BBE2 for ; Fri, 31 Jan 2025 21:18:23 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tdyOw-0007T0-4m; Fri, 31 Jan 2025 16:18:10 -0500 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 1tdyOq-0007RU-Vi for guix-patches@gnu.org; Fri, 31 Jan 2025 16:18:05 -0500 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 1tdyOq-0002Ez-Kn for guix-patches@gnu.org; Fri, 31 Jan 2025 16:18:04 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=+6oVMAFrVlP5a1Qf3PhHtb+eJDKwCwoP5AOQ5vSEYDY=; b=iIy9lI/RAQf2l79YxpT9xpuND7h7lsiuS5Uu9FApAmnis+wuGNKSb3Ddq3hRgZEtOLKrKbQh5KnNjiMi/jAIfN+kRES5+r36xvzlQ/fvTuEWQITaWTXRc2/vamJ1GMLUeF3e49haroOaa2bqF/rIh/FiJKV1stiyR34scE1KMEVDEXGqFdQh5TAZN6XLO52Kc1J74fxTrWbVzcN7wA3Ft5epFYLyAv/OV0PQpsPSoKsd+CxPe67Ll8s+6k+G1d8ff6zX8zeFBmI0hUhWVjdxlwd6TMcnjTzEc4AD6jQF9n1Xxa5r0MFvkz9hIi+RgSqeXeLoSx9e7xOBbCTps1KImA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tdyOp-0005fr-LS; Fri, 31 Jan 2025 16:18:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#75980] [PATCH rust-team 067/106] gnu: rust-rust-htslib-0.38: Build. Resent-From: Herman Rimm Original-Sender: "Debbugs-submit" Resent-CC: divya@subvertising.org, efraim@flashner.co.il, guix-patches@gnu.org Resent-Date: Fri, 31 Jan 2025 21:18:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 75980 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 75980@debbugs.gnu.org Cc: Divya Ranjan Pattanaik , Efraim Flashner X-Debbugs-Original-Xcc: Divya Ranjan Pattanaik , Efraim Flashner Received: via spool by 75980-submit@debbugs.gnu.org id=B75980.173835824521713 (code B ref 75980); Fri, 31 Jan 2025 21:18:03 +0000 Received: (at 75980) by debbugs.gnu.org; 31 Jan 2025 21:17:25 +0000 Received: from localhost ([127.0.0.1]:54914 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tdyOD-0005e9-3J for submit@debbugs.gnu.org; Fri, 31 Jan 2025 16:17:25 -0500 Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:42993 helo=email.rimm.ee) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tdyJd-00059Z-32 for 75980@debbugs.gnu.org; Fri, 31 Jan 2025 16:12:42 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman; t=1738357952; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=+6oVMAFrVlP5a1Qf3PhHtb+eJDKwCwoP5AOQ5vSEYDY=; b=cORTUNgqSnRwGRWZLsdw4CVGf+FDjTOt0fe4EdehuowxiTqsfd7cAblvY6/dzBwvhYbidR rKocZMh1dxTchWgnkQcm3OAvoY3L/yIWeP7V8N2E1mQT6RWe+dukDEdGcaDpB2pZB+bEls PR01/tAZls4wdkB6tcKCuE9oB8r/UHrU6XK5zPjfp0X7Hk9mf14qljsGRn+Apl82PipfZG K4gN22mGmsl2jMSeRgP9LlunuZGDoabGIY+zcQeBxL4dEdlFmfhiSYruMy/N6+nohSntMW 91s++UnJN900znMpM2UzDea5iN+8rOl1RdmH3tz/cyvAU3qBg73PAIPTiS3Wmg== Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id f2de1a9a (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for <75980@debbugs.gnu.org>; Fri, 31 Jan 2025 21:12:31 +0000 (UTC) Date: Fri, 31 Jan 2025 22:10:28 +0100 Message-ID: X-Mailer: git-send-email 2.47.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: Herman Rimm X-ACL-Warn: , Herman Rimm via Guix-patches X-Patchwork-Original-From: Herman Rimm via Guix-patches via From: Herman Rimm 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 * gnu/packages/crates-io.scm (rust-rust-htslib-0.38)[source]: Fix test. [arguments]: Build. Add rust-serde-json-1, rust-tempfile-3 to cargo-development-inputs. [inputs]: Add curl, openssl, zlib. Change-Id: I112f661cb47c3a9ae3a7c74f43ce807027f13752 --- gnu/packages/crates-io.scm | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 4d5571a8f0e..6969a88d7e4 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -66106,18 +66106,20 @@ (define-public rust-rust-htslib-0.38 (package (name "rust-rust-htslib") (version "0.38.2") - (source (origin - (method url-fetch) - (uri (crate-uri "rust-htslib" version)) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "070sihnvyiyqcw8yjkdl8hvav598bsw36m722phgd2b394k6djia")))) + (source + (origin + (method url-fetch) + (uri (crate-uri "rust-htslib" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "070sihnvyiyqcw8yjkdl8hvav598bsw36m722phgd2b394k6djia")) + (modules '((guix build utils))) + (snippet #~(substitute* "src/bam/mod.rs" + (("hashmap.get\\(\"SQ\".into") + "hashmap.get::(&\"SQ\".to_owned"))))) (build-system cargo-build-system) (arguments - ;; TODO: cannot find openssl_src - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-bio-types" ,rust-bio-types-0.12) ("rust-byteorder" ,rust-byteorder-1) ("rust-custom-derive" ,rust-custom-derive-0.1) @@ -66135,8 +66137,10 @@ (define-public rust-rust-htslib-0.38 ("rust-url" ,rust-url-2)) #:cargo-development-inputs (("rust-bincode" ,rust-bincode-1) - ("rust-pretty-assertions" ,rust-pretty-assertions-0.6)))) - (inputs (list openssl)) + ("rust-pretty-assertions" ,rust-pretty-assertions-0.6) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-tempfile" ,rust-tempfile-3)))) + (inputs (list curl openssl zlib)) (native-inputs (list pkg-config)) (home-page "https://github.com/rust-bio/rust-htslib.git") (synopsis "HTSlib bindings and API for reading and writing BAM files")