Message ID | cover.1745855744.git.hako@ultrarare.space |
---|---|
Headers |
Return-Path: <guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org> X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id EA5C327BC4A; Mon, 28 Apr 2025 17:34:08 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL, RCVD_IN_VALIDITY_SAFE,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 714F527BC49 for <patchwork@mira.cbaines.net>; Mon, 28 Apr 2025 17:34:08 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from <guix-patches-bounces@gnu.org>) id 1u9RPo-0007vi-D6; Mon, 28 Apr 2025 12:33:08 -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 <Debian-debbugs@debbugs.gnu.org>) id 1u9RPG-0007f6-I7 for guix-patches@gnu.org; Mon, 28 Apr 2025 12:32:40 -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 <Debian-debbugs@debbugs.gnu.org>) id 1u9RP6-0004Rd-Lx; Mon, 28 Apr 2025 12:32:31 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:In-Reply-To:References:Subject; bh=aLD27KLXtX1dGDSvu2TiuBBPPWEEbXE95c+iMuslJaI=; b=jhkHTiUz1kDwFt/arPC++iBYHTVfA829BQJH5G6KUIzew1gFrIyyUgEr1eo7+exCWF2Jhr/3mV133LmA1c1cWPVctidouBEDWGrh9OSzaq4fI/0H2D0KnQM19qO1T+yaadS7jkfcQ1GDMFi+tiXVR3gP/e8yyGGhOEjxMMrEy056NbQjMfR4S3KVoM8p9gh0oEdm/n7OTa7SZFneMocUMdcE5y8Av8kP5OTyJ3oSm6FUVHhJMVfKiQOh6+1qia1b1r59ir7G5Ll0I9/NmZNWL6gcuBcHrfoNcYN907LKNRJAztqTs+AtP3SQQx+062JSuNm137UAFx1h17aDTz5JPQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1u9ROq-0003H3-3h; Mon, 28 Apr 2025 12:32:08 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77093] [PATCH v4 rust-team 00/22] Cargo.lock importer and build system changes. References: <cover.1742281797.git.hako@ultrarare.space> In-Reply-To: <cover.1742281797.git.hako@ultrarare.space> Resent-From: Hilton Chain <hako@ultrarare.space> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org> Resent-CC: guix@cbaines.net, divya@subvertising.org, efraim@flashner.co.il, hako@ultrarare.space, dev@jpoiret.xyz, ludo@gnu.org, othacehe@gnu.org, maxim.cournoyer@gmail.com, zimon.toutoune@gmail.com, steve@futurile.net, me@tobias.gr, guix-patches@gnu.org Resent-Date: Mon, 28 Apr 2025 16:32:07 +0000 Resent-Message-ID: <handler.77093.B77093.174585788412070@debbugs.gnu.org> Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 77093 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 77093@debbugs.gnu.org Cc: Hilton Chain <hako@ultrarare.space>, Christopher Baines <guix@cbaines.net>, Divya Ranjan Pattanaik <divya@subvertising.org>, Efraim Flashner <efraim@flashner.co.il>, Hilton Chain <hako@ultrarare.space>, Josselin Poiret <dev@jpoiret.xyz>, Ludovic =?utf-8?q?Court=C3=A8s?= <ludo@gnu.org>, Mathieu Othacehe <othacehe@gnu.org>, Maxim Cournoyer <maxim.cournoyer@gmail.com>, Simon Tournier <zimon.toutoune@gmail.com>, Steve George <steve@futurile.net>, Tobias Geerinckx-Rice <me@tobias.gr> X-Debbugs-Original-Xcc: Christopher Baines <guix@cbaines.net>, Divya Ranjan Pattanaik <divya@subvertising.org>, Efraim Flashner <efraim@flashner.co.il>, Hilton Chain <hako@ultrarare.space>, Josselin Poiret <dev@jpoiret.xyz>, Ludovic =?utf-8?q?Court=C3=A8s?= <ludo@gnu.org>, Mathieu Othacehe <othacehe@gnu.org>, Maxim Cournoyer <maxim.cournoyer@gmail.com>, Simon Tournier <zimon.toutoune@gmail.com>, Steve George <steve@futurile.net>, Tobias Geerinckx-Rice <me@tobias.gr> Received: via spool by 77093-submit@debbugs.gnu.org id=B77093.174585788412070 (code B ref 77093); Mon, 28 Apr 2025 16:32:07 +0000 Received: (at 77093) by debbugs.gnu.org; 28 Apr 2025 16:31:24 +0000 Received: from localhost ([127.0.0.1]:32814 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces@debbugs.gnu.org>) id 1u9RO7-00038W-N3 for submit@debbugs.gnu.org; Mon, 28 Apr 2025 12:31:24 -0400 Received: from mail.boiledscript.com ([2a01:4f8:242:4aeb::42]:47434) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from <hako@ultrarare.space>) id 1u9RO0-00036v-FF for 77093@debbugs.gnu.org; Mon, 28 Apr 2025 12:31:19 -0400 From: Hilton Chain <hako@ultrarare.space> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=mail; t=1745857873; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aLD27KLXtX1dGDSvu2TiuBBPPWEEbXE95c+iMuslJaI=; b=YxH6um/QNdIAZ8sWrLLeENCxFB9Xpnybb4t/LJs3E31Zai6r36tKT2iMjDBbMX00aUl4WB J1VWFQfYlNRAVNtuyreNxIi+GjT9WMMNsmsTBDxXLUBvYaNL1/X+vdxQEOIvbFMQejr4LV Mg46oo8k3qgZfOVq+H/AB83MFZ704oOhbYJIuhKmA00q0mQ4JCCIsTmLUoSMydprckdexM OoC8ymiYHrL7MGTZVqtFXKI2hqHvR+rYL4jeXZmuo++/3yfJh39kt81dSH/2E9Ska8BvLI FziBy3k+Qxln5Ow7Izpj5qK35J6BlRppFKEogdD/ZAXgGtSiVETIbBI3D3AJYA== Date: Tue, 29 Apr 2025 00:22:57 +0800 Message-ID: <cover.1745855744.git.hako@ultrarare.space> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: <guix-patches.gnu.org> List-Unsubscribe: <https://lists.gnu.org/mailman/options/guix-patches>, <mailto:guix-patches-request@gnu.org?subject=unsubscribe> List-Archive: <https://lists.gnu.org/archive/html/guix-patches> List-Post: <mailto:guix-patches@gnu.org> List-Help: <mailto:guix-patches-request@gnu.org?subject=help> List-Subscribe: <https://lists.gnu.org/mailman/listinfo/guix-patches>, <mailto:guix-patches-request@gnu.org?subject=subscribe> 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 |
Series |
Cargo.lock importer and build system changes.
|
|
Message
Hilton Chain
April 28, 2025, 4:22 p.m. UTC
Main changes since v3: * ‘define-cargo-inputs’ macro suggested by Ludovic. * ‘cargo-inputs-from-lockfile’ suggested by Zheng Junjie, which can be used in the guix.scm of a Rust project. * Rephrase docstring. Some changes have been made on rust-team since v3, this revision also sends all of them out for review. I'll change the terms Rust program & dependency to application & library, btw. Since there're too many patches in this issue, I think it would be better to open a new one for documentation. Thanks Efraim Flashner (1): build/cargo: Don't try to unpack sanity-check.py. Hilton Chain (21): scripts: import: Correct behavior for ‘--insert’ option. scripts: import: Add two newlines for ‘--insert’ option. scripts: import: Support expressions defined by 'define. scripts: import: Pass "--insert" to importers. scripts: import: Skip existing definition for ‘--insert’ option. import: crate: crate-name->package-name: Move to (guix build-system cargo). build/cargo: Pass ‘--offline’ to cargo. build/cargo: Print out all non-empty binary files. build-system: cargo: Support packaging Cargo workspace. build-system: cargo: Support installing Cargo workspace. build/cargo: Set default value of arguments for build phases. build/cargo: Support non-workspace directory source inputs. build/cargo: Don't vendor self. build/cargo: Use system libsqlite3. build/cargo: Use sytsem oniguruma. build/cargo: Unconditionally use system gettext. build-system: cargo: Add ‘cargo-inputs’. build-system: cargo: Export ‘cargo-triplet’. build/cargo: Accept rust-sysroot from native-inputs. import: crate: Add Cargo.lock parser. import: crate: Add ‘--lockfile’ option. Makefile.am | 1 + doc/guix.texi | 15 +++ etc/teams.scm | 1 + etc/teams/rust/audit-rust-crates | 70 +++++++++++ etc/teams/rust/cleanup-crates.sh | 37 ++++++ etc/teams/rust/rust-crates.tmpl | 44 +++++++ etc/teams/rust/unpack-new-crates.sh | 45 +++++++ gnu/local.mk | 2 + gnu/packages/antivirus.scm | 5 +- gnu/packages/gnome.scm | 5 - gnu/packages/python-crypto.scm | 5 - gnu/packages/python-xyz.scm | 5 - gnu/packages/rust-crates.scm | 44 +++++++ gnu/packages/rust-sources.scm | 29 +++++ gnu/packages/syndication.scm | 5 - guix/build-system/cargo.scm | 66 +++++++++- guix/build/cargo-build-system.scm | 179 ++++++++++++++++++++-------- guix/import/crate.scm | 128 +++++++++++++++++++- guix/import/crate/cargo-lock.scm | 105 ++++++++++++++++ guix/scripts/import.scm | 67 ++++++++--- guix/scripts/import/crate.scm | 57 +++++++-- guix/utils.scm | 29 +++-- tests/crate.scm | 87 ++++++++++++++ 23 files changed, 914 insertions(+), 117 deletions(-) create mode 100755 etc/teams/rust/audit-rust-crates create mode 100755 etc/teams/rust/cleanup-crates.sh create mode 100644 etc/teams/rust/rust-crates.tmpl create mode 100755 etc/teams/rust/unpack-new-crates.sh create mode 100644 gnu/packages/rust-crates.scm create mode 100644 gnu/packages/rust-sources.scm create mode 100644 guix/import/crate/cargo-lock.scm base-commit: 8f57b1dd2a544b882d365c5be17ebcf51d9594f6 -- 2.49.0