From patchwork Sun Sep 29 07:55:03 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Efraim Flashner X-Patchwork-Id: 31548 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 26C3927BBEA; Sun, 29 Sep 2024 08:58:05 +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=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_VALIDITY_CERTIFIED, RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS 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 851FD27BBE2 for ; Sun, 29 Sep 2024 08:58:04 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1suooA-0005Dv-Ol; Sun, 29 Sep 2024 03:57:34 -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 1suoo8-0005DY-Vr for guix-patches@gnu.org; Sun, 29 Sep 2024 03:57: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 1suoo8-0002O1-ML for guix-patches@gnu.org; Sun, 29 Sep 2024 03:57:32 -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:References:In-Reply-To:Date:From:To:Subject; bh=4JuGwJaWVxWoEyExznjx3Rh/VpUcmOo7Yn+RastKGFs=; b=ISjBUJAlzS0vHzMh5cK0sEfyoVA8uop2Zinq1w3cwxMe9v1/TNJDTUXKSr5OLs0dhdZfOYIP7IgdI0DjJeTRoObKt2i64Q/wOA+WkBwGn80aPV6QG04+DENVhQWGQ2yhOG6ZZfGwnv4u/J1s6bjdDhcBEJplBrFCn1YhjO8BVsi4GKd1MtnyvL2LYWr7uqD4rRBqHl524zvIBV/A0y3BSxoYFxHkc2/O+p2mFgmqwu2IbL6y/5OQn6wem7jBBHmRl4OapZKQwgdHvy7Xcvy7kCBdSkUM0dJj+PYr0CIMgjARmayAUILSz4z8qREK2GYlID73NPWI3JVhf8AgVUvbxw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1suood-0007A4-8J for guix-patches@gnu.org; Sun, 29 Sep 2024 03:58:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73549] [PATCH 1/4] gnu: Add corrosion. Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 29 Sep 2024 07:58:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 73549 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 73549@debbugs.gnu.org Cc: Charles , Efraim Flashner Received: via spool by 73549-submit@debbugs.gnu.org id=B73549.172759662527100 (code B ref 73549); Sun, 29 Sep 2024 07:58:03 +0000 Received: (at 73549) by debbugs.gnu.org; 29 Sep 2024 07:57:05 +0000 Received: from localhost ([127.0.0.1]:39036 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1suong-00072x-Eq for submit@debbugs.gnu.org; Sun, 29 Sep 2024 03:57:05 -0400 Received: from mail-wm1-f49.google.com ([209.85.128.49]:61601) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1suone-000729-5c for 73549@debbugs.gnu.org; Sun, 29 Sep 2024 03:57:03 -0400 Received: by mail-wm1-f49.google.com with SMTP id 5b1f17b1804b1-42cafda818aso32338355e9.2 for <73549@debbugs.gnu.org>; Sun, 29 Sep 2024 00:56:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1727596524; x=1728201324; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=4JuGwJaWVxWoEyExznjx3Rh/VpUcmOo7Yn+RastKGFs=; b=kK64I1EVUu98eLsKjDtMjc17xsYACjBKsnK4IsoR82ldMaPljr9aNDz0ugDa2SdD75 M2pY+Hn0vhBua1j2NP9dFBfgFgqdQFfJafRF4VnB4FU9ak+RsVvi5AyhPee9khJuS+gY 1xRl0hZ7KzhXnl4AwuiCWMzFNnbZ3UwjMGfIlev5vN0W6CmRfxrttxrzmNYYMKZavMvR f/Hn2dKgf7oXykgYUrOIIA95GwJuq5j+pkTqY5HIxTtpv2zedfTJowc6cK1l+eAcjmds Nu6lzgmR9OlivxrntOnqclsKm+8laXgtDQx7QgicIbjwb25urzZnbEVA2wTYkBJBa273 KI3w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1727596524; x=1728201324; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=4JuGwJaWVxWoEyExznjx3Rh/VpUcmOo7Yn+RastKGFs=; b=NWHcCDV4zU47z3ZUxHjOG2NbQR9QzlXHcA9ZuUE+XMigA1rHyi3QZ+48z+lIQM826g bhTxg5e2ttpoDjEw1gqEqhUrVWUy0wcrl0+HwoQ25oOwQcaxPTVx0xJ3naNP3RuIljZX 7V3vNpOujrGv3zxLiszyGgYij2jQFknCVr8suFSNeH7rlfjVv4YLpXVyhNIttHpk+qoF bdML2wtQXGZuN8pxkzXV6m4fCu8Z+MujDK+2GyqAwl95KEakPLiWdH8zF15dmS4Itdk5 kn8fStAzONjjkR+ecIijSdZq84t8+BjqVVmyA0/nEAs/qgeoIzWxQlRP0g0CwgA4PUFo UQHQ== X-Gm-Message-State: AOJu0YyJ6uRbPfbtafXU/Rri5/EkzpU0a+a+GF27gO8owHLb3pKwJlie oJbDC0IORhW9wR5FMMzzILx84933oNHmqYclM7pSwkvAg1NpUIiETNIMBBrz X-Google-Smtp-Source: AGHT+IGB/JI9Mgk5dTBLuseYNW9QhBVa9e2j2xX1fMYrM6j2/syeG6TxsO2qoFFiC7EBKVVkfARPfw== X-Received: by 2002:adf:cd8b:0:b0:374:c911:7749 with SMTP id ffacd0b85a97d-37cd5b28a9fmr5159077f8f.49.1727596523759; Sun, 29 Sep 2024 00:55:23 -0700 (PDT) Received: from localhost ([141.226.162.35]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-42f57e2fb5bsm69787725e9.39.2024.09.29.00.55.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Sep 2024 00:55:22 -0700 (PDT) From: Efraim Flashner Date: Sun, 29 Sep 2024 10:55:03 +0300 Message-ID: <5e0b111590eb34d408b770f3a3ca5be8f3dc603d.1727596132.git.efraim@flashner.co.il> X-Mailer: git-send-email 2.46.0 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: , 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 From: Charles * gnu/packages/cmake.scm (corrosion): New variable. Signed-off-by: Efraim Flashner Change-Id: I0bb56889722128b9946af495fab05d39beaaf65a --- gnu/packages/cmake.scm | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/gnu/packages/cmake.scm b/gnu/packages/cmake.scm index 4466c4b91dd..8310dc55fa7 100644 --- a/gnu/packages/cmake.scm +++ b/gnu/packages/cmake.scm @@ -14,6 +14,7 @@ ;;; Copyright © 2021 Ricardo Wurmus ;;; Copyright © 2024 John Kehayias ;;; Copyright © 2024 dan +;;; Copyright © 2024 Charles ;;; ;;; This file is part of GNU Guix. ;;; @@ -54,6 +55,7 @@ (define-module (gnu packages cmake) #:use-module (gnu packages kde-frameworks) #:use-module (gnu packages libevent) #:use-module (gnu packages ncurses) + #:use-module (gnu packages rust) #:use-module (gnu packages serialization) #:use-module (gnu packages sphinx) #:use-module (gnu packages texinfo) @@ -440,6 +442,46 @@ (define-public cmake-minimal-cross (search-paths (package-native-search-paths cmake-minimal)))) +(define-public corrosion + (package + (name "corrosion") + (version "0.5.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/corrosion-rs/corrosion") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1sm1jhdrqzp3f36f7grh900wp7pk9l1zim49hrk87ac6frfmg8xx")))) + (build-system cmake-build-system) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "ctest" "-E" + (string-append + "(" (string-join + (list "cbindgen_rust2cpp" + "rustup_proxy" + "hostbuild" + "parse_target_triple") + "|") + ")")))))))) + (native-inputs + (list rust + `(,rust "cargo"))) + (home-page "https://corrosion-rs.github.io/corrosion/") + (synopsis "Tool for integrating Rust into an existing CMake project") + (description "Corrosion, formerly known as cmake-cargo, is a tool for +integrating Rust into an existing CMake project. Corrosion can automatically +import executables, static libraries, and dynamic libraries from a workspace +or package manifest (Cargo.toml file).") + (license license:expat))) + (define-public emacs-cmake-mode (package (inherit cmake)