From patchwork Tue Apr 25 09:39:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sughosha X-Patchwork-Id: 49500 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 57A1427BBE9; Tue, 25 Apr 2023 10:40:25 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,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 62C0327BBE2 for ; Tue, 25 Apr 2023 10:40:20 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1prF9f-0004xV-Bt; Tue, 25 Apr 2023 05:40:11 -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 1prF9X-0004wq-42 for guix-patches@gnu.org; Tue, 25 Apr 2023 05:40:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1prF9W-0000O2-Oy for guix-patches@gnu.org; Tue, 25 Apr 2023 05:40:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1prF9W-0006F0-3N for guix-patches@gnu.org; Tue, 25 Apr 2023 05:40:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63065] [PATCH 18/18] gnu: Add yabridgectl. References: In-Reply-To: Resent-From: Sughosha Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 25 Apr 2023 09:40:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63065 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: "63065@debbugs.gnu.org" <63065@debbugs.gnu.org> Received: via spool by 63065-submit@debbugs.gnu.org id=B63065.168241557823950 (code B ref 63065); Tue, 25 Apr 2023 09:40:02 +0000 Received: (at 63065) by debbugs.gnu.org; 25 Apr 2023 09:39:38 +0000 Received: from localhost ([127.0.0.1]:51403 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1prF94-0006EA-Ot for submit@debbugs.gnu.org; Tue, 25 Apr 2023 05:39:38 -0400 Received: from mail-40135.protonmail.ch ([185.70.40.135]:12075) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1prF8z-0006Dt-Bd for 63065@debbugs.gnu.org; Tue, 25 Apr 2023 05:39:33 -0400 Date: Tue, 25 Apr 2023 09:39:09 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=proton.me; s=protonmail; t=1682415560; x=1682674760; bh=reieBoPVOlCHD7fEs6GHErbVvGgNb0/KiWWtfyhY+28=; h=Date:To:From:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector; b=SaDNwC4jt24wuxieAIitjLUD5satuUwPG6GWjXz0k9bN/pAGTOTyAHYRrZRaD5wYw prZ6UqeawF2ijpbJm4BDfLalVdI75V0szI0hOz+Gc66Jg1jLt/8MPGIrunjWNjvRAN +h0+uCCD0qHy0ia9kTMnYyRnZHP5a8gX2vqwhoeOPS4K+MCE5bz826Ztf91HZB2prR LFWm5ycbImmppBW24jQwSTS7+fvBdUBtF7dtB7GQ4W6msrJo62qpg8S6mkvAmgYI3N NRFMMfJSA6Qy7PfWw466vMr96U0fAHlSfSkvhzKbk6eRZeD9ib9vvJPB6whzxLbQPw QDpPq17b4HyIg== Message-ID: Feedback-ID: 45211691:user:proton 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: Sughosha X-ACL-Warn: , Sughosha via Guix-patches X-Patchwork-Original-From: Sughosha via Guix-patches via From: Sughosha 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/rust-apps.scm (yabridgectl): New variable. * gnu/packages/patches/yabridgectl-5.0.4-fix-reflink.patch: New file. * gnu/local.mk: Register the patch file. --- gnu/local.mk | 1 + gnu/packages/audio.scm | 52 +++++++++++++++++++ .../yabridgectl-5.0.4-fix-reflink.patch | 28 ++++++++++ 3 files changed, 81 insertions(+) create mode 100644 gnu/packages/patches/yabridgectl-5.0.4-fix-reflink.patch diff --git a/gnu/local.mk b/gnu/local.mk index 2bafdc7f02..e56c1169d2 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2039,6 +2039,7 @@ dist_patch_DATA = \ %D%/packages/patches/xterm-370-explicit-xcursor.patch \ %D%/packages/patches/xygrib-fix-finding-data.patch \ %D%/packages/patches/yabridge-5.0.4-fix-dependency-search.patch \ + %D%/packages/patches/yabridgectl-5.0.4-fix-reflink.patch \ %D%/packages/patches/yggdrasil-extra-config.patch \ %D%/packages/patches/zig-use-system-paths.patch diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 551c9193c6..9a2735085b 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -73,6 +73,7 @@ (define-module (gnu packages audio) #:use-module (gnu packages cmake) #:use-module (gnu packages compression) #:use-module (gnu packages cpp) + #:use-module (gnu packages crates-io) #:use-module (gnu packages curl) #:use-module (gnu packages dbm) #:use-module (gnu packages documentation) @@ -137,6 +138,7 @@ (define-module (gnu packages audio) #:use-module (gnu packages xiph) #:use-module (gnu packages xml) #:use-module (gnu packages xorg) + #:use-module (guix build-system cargo) #:use-module (guix build-system cmake) #:use-module (guix build-system copy) #:use-module (guix build-system glib-or-gtk) @@ -3563,6 +3565,56 @@ (define-public yabridge quick startup times.") (license license:gpl3+))) +(define-public yabridgectl + (package + (inherit yabridge) + (name "yabridgectl") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/robbert-vdh/yabridge") + (commit (package-version yabridge)))) + (sha256 + (base32 + "08p92a2qx5k2531wr38mrksn7g16j0mz611rwla1m0igfc4r75fp")) + (patches + (search-patches "yabridgectl-5.0.4-fix-reflink.patch")))) + (build-system cargo-build-system) + (arguments + (list #:cargo-inputs + `(("rust-anyhow" ,rust-anyhow-1) + ("rust-clap" ,rust-clap-3) + ("rust-colored" ,rust-colored-2) + ("rust-is-executable" ,rust-is-executable-1) + ("rust-goblin" ,rust-goblin-0.6) + ("rust-libloading" ,rust-libloading-0.7) + ("rust-promptly" ,rust-promptly-0.3) + ("rust-rayon" ,rust-rayon-1) + ("rust-reflink" ,rust-reflink-0.1) + ("rust-serde" ,rust-serde-1) + ("rust-serde-derive" ,rust-serde-derive-1) + ("rust-serde-jsonrc" ,rust-serde-jsonrc-0.1) + ("rust-textwrap" ,rust-textwrap-0.11) + ("rust-toml" ,rust-toml-0.5) + ("rust-walkdir" ,rust-walkdir-2) + ("rust-which" ,rust-which-4) + ("rust-xdg" ,rust-xdg-2)) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'change-directory + (lambda _ + (chdir "tools/yabridgectl"))) + (add-after 'install 'wrap-program + (lambda _ + (wrap-program (string-append #$output "/bin/yabridgectl") + `("LD_LIBRARY_PATH" ":" prefix + (,(string-append #$output "/lib"))))))))) + (native-inputs '()) + (inputs (list dbus)) + (synopsis "Utility to set up and update yabridge") + (description + "@command{yabridgectl} is a tool to setup and update @code{yabridge}."))) + (define-public patchage (package (name "patchage") diff --git a/gnu/packages/patches/yabridgectl-5.0.4-fix-reflink.patch b/gnu/packages/patches/yabridgectl-5.0.4-fix-reflink.patch new file mode 100644 index 0000000000..26a82b7c95 --- /dev/null +++ b/gnu/packages/patches/yabridgectl-5.0.4-fix-reflink.patch @@ -0,0 +1,28 @@ +Guix does not allow fetching from remote git repository within build phase. +This patch refers the packaged reflink. + +From 434d15bab0f7df8848be06633e2c0ec1ef91f9f1 Mon Sep 17 00:00:00 2001 +From: Sughosha +Date: Sun, 23 Apr 2023 10:02:26 +0200 +Subject: [PATCH] Fix reflink. + +--- + tools/yabridgectl/Cargo.toml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tools/yabridgectl/Cargo.toml b/tools/yabridgectl/Cargo.toml +index f2ea73fb..09490e43 100644 +--- a/tools/yabridgectl/Cargo.toml ++++ b/tools/yabridgectl/Cargo.toml +@@ -18,7 +18,7 @@ goblin = { version = "0.6", default_features = false, features = ["std", "pe32", + libloading = "0.7.3" + promptly = "0.3.1" + # Version 0.1.3 from crates.io assumes a 64-bit toolchain +-reflink = { git = "https://github.com/nicokoch/reflink", rev = "e8d93b465f5d9ad340cd052b64bbc77b8ee107e2" } ++reflink = "0.1.3" + rayon = "1.5.1" + serde = "1.0.133" + serde_derive = "1.0.133" +-- +2.39.2 +