all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Sughosha via Guix-patches via <guix-patches@gnu.org>
To: 63065@debbugs.gnu.org
Cc: Sughosha <sughosha@disroot.org>, Gabriel Wicki <gabriel@erlikon.ch>
Subject: [bug#63065] [PATCH v4 7/7] gnu: Add yabridgectl.
Date: Wed,  1 Nov 2023 10:19:58 +0100	[thread overview]
Message-ID: <cec5f1b122632f1b7e84a55647013d689b0ebcce.1698830150.git.sughosha@disroot.org> (raw)
In-Reply-To: <cover.1698830150.git.sughosha@disroot.org>

* gnu/packages/audio.scm (yabridgectl): New variable.
* gnu/packages/patches/yabridgectl-5.0.4-use-system-reflink.patch: New
patch file.
* gnu/local.mk: Register it.

Change-Id: I6a7fe3eff7852c60c306c4559cf00a4161ce81e1
---
 gnu/local.mk                                  |  1 +
 gnu/packages/audio.scm                        | 61 +++++++++++++++++++
 ...yabridgectl-5.0.4-use-system-reflink.patch | 23 +++++++
 3 files changed, 85 insertions(+)
 create mode 100644 gnu/packages/patches/yabridgectl-5.0.4-use-system-reflink.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 4718ad49a5..e535a8403e 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -2168,6 +2168,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/xygrib-fix-finding-data.patch		\
   %D%/packages/patches/xygrib-newer-proj.patch			\
   %D%/packages/patches/yabridge-5.0.4-fix-dependency-search.patch	\
+  %D%/packages/patches/yabridgectl-5.0.4-use-system-reflink.patch	\
   %D%/packages/patches/yggdrasil-extra-config.patch	\
   %D%/packages/patches/zig-0.9-riscv-support.patch		\
   %D%/packages/patches/zig-do-not-link-against-librt.patch	\
diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index aae97d4169..102d064fb2 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -76,6 +76,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)
@@ -144,6 +145,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)
@@ -6056,6 +6058,65 @@ (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
+                "0ayl706nv67jkixbrh9z7225gdwg2s4rzndx77761x33mk6by7a8"))
+              (patches
+               (search-patches
+                 "yabridgectl-5.0.4-use-system-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 'change-directory 'patch-paths
+                 (lambda _
+                   (with-directory-excursion "src"
+                     (substitute* '("config.rs" "main.rs")
+                       (("/usr") #$yabridge)))))
+               (add-after 'install 'wrap-program
+                (lambda _
+                  (wrap-program (string-append #$output "/bin/yabridgectl")
+                    `("LD_LIBRARY_PATH" ":" prefix
+                      (,(string-append #$yabridge "/lib")
+                       ,(string-append #$dbus "/lib")))))))))
+    (native-inputs '())
+    (inputs
+     (list dbus))
+    (propagated-inputs
+     (list yabridge))
+    (synopsis "Utility to set up and update yabridge")
+    (description
+     "@command{yabridgectl} is a tool to setup and update @code{yabridge}.")))
+
 (define-public ableton-link
   (package
     (name "ableton-link")
diff --git a/gnu/packages/patches/yabridgectl-5.0.4-use-system-reflink.patch b/gnu/packages/patches/yabridgectl-5.0.4-use-system-reflink.patch
new file mode 100644
index 0000000000..d863f35c2f
--- /dev/null
+++ b/gnu/packages/patches/yabridgectl-5.0.4-use-system-reflink.patch
@@ -0,0 +1,23 @@
+rust-reflink version 0.1.3 available in Guix is patched with the fix for
+the assumption of a 64-bit toolchain.
+
+---
+ 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
+
-- 
2.41.0





  parent reply	other threads:[~2023-11-01  9:23 UTC|newest]

Thread overview: 53+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-04-25  9:22 [bug#63065] [PATCH 0/18]: gnu: Add yabridgectl Sughosha via Guix-patches via
2023-04-25  9:25 ` [bug#63065] [PATCH 01/18] gnu: asio: Update to 1.24.0 Sughosha via Guix-patches via
2023-04-25  9:27 ` [bug#63065] [PATCH 02/18] gnu: Add bitsery Sughosha via Guix-patches via
2023-04-25  9:27 ` [bug#63065] [PATCH 03/18] gnu: Add function2 Sughosha via Guix-patches via
2023-04-25  9:28 ` [bug#63065] [PATCH 04/18] gnu: Add tomlplusplus Sughosha via Guix-patches via
2023-04-25  9:29 ` [bug#63065] [PATCH 05/18] gnu: Add clap Sughosha via Guix-patches via
2023-04-25  9:30 ` [bug#63065] [PATCH 06/18] gnu: Add vst3sdk Sughosha via Guix-patches via
2023-04-25  9:30 ` [bug#63065] [PATCH 07/18] gnu: Add yabridge Sughosha via Guix-patches via
2023-04-25  9:31 ` [bug#63065] [PATCH 08/18] gnu: Add rust-scroll-derive-0.11 Sughosha via Guix-patches via
2023-04-25  9:31 ` [bug#63065] [PATCH 09/18] gnu: Add rust-scroll-0.11 Sughosha via Guix-patches via
2023-04-25  9:32 ` [bug#63065] [PATCH 10/18] gnu: Add rust-goblin-0.6 Sughosha via Guix-patches via
2023-04-25  9:33 ` [bug#63065] [PATCH 11/18] gnu: rust-libloading-0.7: Update to 0.7.4 Sughosha via Guix-patches via
2023-04-25  9:33 ` [bug#63065] [PATCH 12/18] gnu: Add rust-rustyline-derive-0.6 Sughosha via Guix-patches via
2023-04-25  9:34 ` [bug#63065] [PATCH 13/18] gnu: rust-rustyline-9: Update to 9.1.2 Sughosha via Guix-patches via
2023-04-25  9:35 ` [bug#63065] [PATCH 14/18] gnu: Add rust-promptly-0.3 Sughosha via Guix-patches via
2023-04-25  9:35 ` [bug#63065] [PATCH 15/18] gnu: Add rust-reflink-0.1 Sughosha via Guix-patches via
2023-04-25  9:36 ` [bug#63065] [PATCH 16/18] gnu: Add rust-ryu-0.2 Sughosha via Guix-patches via
2023-04-25  9:38 ` [bug#63065] [PATCH 17/18] gnu: Add rust-serde-jsonrc-0.1 Sughosha via Guix-patches via
2023-04-25  9:39 ` [bug#63065] [PATCH 18/18] gnu: Add yabridgectl Sughosha via Guix-patches via
2023-06-29 10:15 ` [bug#63065] [PATCH v2 00/16] gnu: Add yabridge and yabridgectl Sughosha via Guix-patches via
2023-06-29 10:16 ` [bug#63065] [PATCH v2 01/16] gnu: asio: Update to 1.28.0 Sughosha via Guix-patches via
2023-06-29 10:17 ` [bug#63065] [PATCH v2 02/16] gnu: Add bitsery Sughosha via Guix-patches via
2023-06-29 10:18 ` [bug#63065] [PATCH v2 03/16] gnu: Add function2 Sughosha via Guix-patches via
2023-06-29 10:19 ` [bug#63065] [PATCH v2 04/16] gnu: Add tomlplusplus Sughosha via Guix-patches via
2023-06-29 10:19 ` [bug#63065] [PATCH v2 05/16] gnu: Add clap Sughosha via Guix-patches via
2023-06-29 10:20 ` [bug#63065] [PATCH v2 06/16] gnu: Add yabridge Sughosha via Guix-patches via
2023-06-29 10:22 ` [bug#63065] [PATCH v2 07/16] gnu: Add rust-scroll-derive-0.11 Sughosha via Guix-patches via
2023-06-29 10:22 ` [bug#63065] [PATCH v2 08/16] gnu: Add rust-scroll-0.11 Sughosha via Guix-patches via
2023-06-29 10:23 ` [bug#63065] [PATCH v2 09/16] gnu: Add rust-goblin-0.6 Sughosha via Guix-patches via
2023-06-29 10:23 ` [bug#63065] [PATCH v2 10/16] gnu: Add rust-rustyline-derive-0.6 Sughosha via Guix-patches via
2023-06-29 10:24 ` [bug#63065] [PATCH v2 11/16] gnu: rust-rustyline-9: Update to 9.1.2 Sughosha via Guix-patches via
2023-06-29 10:24 ` [bug#63065] [PATCH v2 12/16] gnu: Add rust-promptly Sughosha via Guix-patches via
2023-06-29 10:25 ` [bug#63065] [PATCH v2 13/16] gnu: Add rust-reflink-0.1 Sughosha via Guix-patches via
2023-06-29 10:25 ` [bug#63065] [PATCH v2 14/16] gnu: Add rust-ryu-0.2 Sughosha via Guix-patches via
2023-06-29 10:26 ` [bug#63065] [PATCH v2 15/16] gnu: Add rust-serde-jsonrc-0.1 Sughosha via Guix-patches via
2023-06-29 10:27 ` [bug#63065] [PATCH v2 16/16] gnu: Add yabridgectl Sughosha via Guix-patches via
2023-06-29 11:15   ` [bug#63065] [PATCH v3 " Sughosha via Guix-patches via
2023-11-01  9:19 ` [bug#63065] [PATCH v4 0/7] " Sughosha via Guix-patches via
2023-11-01  9:19   ` [bug#63065] [PATCH v4 1/7] gnu: Add rust-rustyline-derive-0.6 Sughosha via Guix-patches via
2023-11-01  9:19   ` [bug#63065] [PATCH v4 2/7] gnu: rust-rustyline-9: Update to 9.1.2 Sughosha via Guix-patches via
2023-11-01  9:19   ` [bug#63065] [PATCH v4 3/7] gnu: Add rust-promptly Sughosha via Guix-patches via
2023-11-01  9:19   ` [bug#63065] [PATCH v4 4/7] gnu: Add rust-reflink-0.1 Sughosha via Guix-patches via
2023-11-01  9:19   ` [bug#63065] [PATCH v4 5/7] gnu: Add rust-ryu-0.2 Sughosha via Guix-patches via
2023-11-01  9:19   ` [bug#63065] [PATCH v4 6/7] gnu: Add rust-serde-jsonrc-0.1 Sughosha via Guix-patches via
2023-11-01  9:19   ` Sughosha via Guix-patches via [this message]
2023-11-30 10:56 ` [bug#63065] [PATCH v5 0/7] gnu: Add yabridgectl Sughosha via Guix-patches via
2023-11-30 10:57   ` [bug#63065] [PATCH v5 1/7] gnu: Add rust-rustyline-derive-0.6 Sughosha via Guix-patches via
2023-11-30 10:57   ` [bug#63065] [PATCH v5 2/7] gnu: rust-rustyline-9: Update to 9.1.2 Sughosha via Guix-patches via
2023-11-30 10:57   ` [bug#63065] [PATCH v5 3/7] gnu: Add rust-promptly-0.3 Sughosha via Guix-patches via
2023-11-30 10:57   ` [bug#63065] [PATCH v5 4/7] gnu: Add rust-reflink-0.1 Sughosha via Guix-patches via
2023-11-30 10:57   ` [bug#63065] [PATCH v5 5/7] gnu: Add rust-ryu-0.2 Sughosha via Guix-patches via
2023-11-30 10:57   ` [bug#63065] [PATCH v5 6/7] gnu: Add rust-serde-jsonrc-0.1 Sughosha via Guix-patches via
2023-11-30 10:57   ` [bug#63065] [PATCH v5 7/7] gnu: Add yabridgectl Sughosha via Guix-patches via

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=cec5f1b122632f1b7e84a55647013d689b0ebcce.1698830150.git.sughosha@disroot.org \
    --to=guix-patches@gnu.org \
    --cc=63065@debbugs.gnu.org \
    --cc=gabriel@erlikon.ch \
    --cc=sughosha@disroot.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.