From cf5fc0ef732d79ad8ca1de11765ef798fdb5b166 Mon Sep 17 00:00:00 2001
From: Hilton Chain <hako@ultrarare.space>
Date: Thu, 15 May 2025 19:44:32 +0800
Subject: [PATCH] rosenthal: rosenthal-cargo-inputs: Move to (rosenthal utils
 cargo).

* modules/rosenthal/packages/rust-crates.scm (rosenthal-cargo-inputs): Move
to...
* modules/rosenthal/utils/cargo.scm (rosenthal-cargo-inputs): ...here.
* modules/rosenthal/packages/rust-apps.scm: Adjust module import.
* modules/rosenthal/packages/wm.scm: Likewise.
* modules/rosenthal/packages/xorg.scm: Likewise.

Fixes: https://codeberg.org/hako/Rosenthal/issues/12
---
 modules/rosenthal/packages/rust-apps.scm   |  2 +-
 modules/rosenthal/packages/rust-crates.scm | 14 +-------------
 modules/rosenthal/packages/wm.scm          |  4 ++--
 modules/rosenthal/packages/xorg.scm        |  4 ++--
 modules/rosenthal/utils/cargo.scm          | 17 +++++++++++++++++
 5 files changed, 23 insertions(+), 18 deletions(-)
 create mode 100644 modules/rosenthal/utils/cargo.scm

diff --git a/modules/rosenthal/packages/rust-apps.scm b/modules/rosenthal/packages/rust-apps.scm
index 3367b2b..aedb617 100644
--- a/modules/rosenthal/packages/rust-apps.scm
+++ b/modules/rosenthal/packages/rust-apps.scm
@@ -8,7 +8,7 @@
   #:use-module (guix packages)
   #:use-module (guix git-download)
   #:use-module (guix build-system cargo)
-  #:use-module (rosenthal packages rust-crates))
+  #:use-module (rosenthal utils cargo))
 
 (define-public atuin
   (package
diff --git a/modules/rosenthal/packages/rust-crates.scm b/modules/rosenthal/packages/rust-crates.scm
index 8669898..8a44fc2 100644
--- a/modules/rosenthal/packages/rust-crates.scm
+++ b/modules/rosenthal/packages/rust-crates.scm
@@ -3,16 +3,13 @@
 ;;; SPDX-License-Identifier: GPL-3.0-or-later
 
 (define-module (rosenthal packages rust-crates)
-  #:use-module (guix diagnostics)
-  #:use-module (guix i18n)
   #:use-module (guix packages)
   #:use-module (guix utils)
   #:use-module (guix download)
   #:use-module (guix git-download)
   #:use-module (guix build-system cargo)
   #:use-module (rosenthal packages wm)
-  #:export (lookup-cargo-inputs
-            rosenthal-cargo-inputs))
+  #:export (lookup-cargo-inputs))
 
 ;;;
 ;;; This file is managed by ‘guix import’.  DO NOT add definitions manually.
@@ -49,15 +46,6 @@
              "Return the inputs for NAME."
              (hashq-ref table name))))))))
 
-(define* (rosenthal-cargo-inputs name #:key (module '(rosenthal packages rust-crates)))
-  "Lookup Cargo inputs for NAME defined in MODULE, return an empty list if
-        unavailable."
-  (let ((lookup (module-ref (resolve-interface module) 'lookup-cargo-inputs)))
-    (or (lookup name)
-        (begin
-          (warning (G_ "no Cargo inputs available for '~a'~%") name)
-          '()))))
-
 ;;;
 ;;; Rust dependencies fetched from crates.io and non-workspace development
 ;;; snapshots.
diff --git a/modules/rosenthal/packages/wm.scm b/modules/rosenthal/packages/wm.scm
index faa7f53..6167cef 100644
--- a/modules/rosenthal/packages/wm.scm
+++ b/modules/rosenthal/packages/wm.scm
@@ -8,6 +8,7 @@
   #:use-module (guix packages)
   #:use-module (guix git-download)
   #:use-module (guix build-system cargo)
+  #:use-module (rosenthal utils cargo)
   #:use-module (gnu packages admin)
   #:use-module (gnu packages freedesktop)
   #:use-module (gnu packages gl)
@@ -17,8 +18,7 @@
   #:use-module (gnu packages llvm)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages wm)
-  #:use-module (gnu packages xdisorg)
-  #:use-module (rosenthal packages rust-crates))
+  #:use-module (gnu packages xdisorg))
 
 (define-public rust-pipewire
   (let ((commit "fd3d8f7861a29c2eeaa4c393402e013578bb36d9")
diff --git a/modules/rosenthal/packages/xorg.scm b/modules/rosenthal/packages/xorg.scm
index fba3c06..6c63759 100644
--- a/modules/rosenthal/packages/xorg.scm
+++ b/modules/rosenthal/packages/xorg.scm
@@ -8,10 +8,10 @@
   #:use-module (guix packages)
   #:use-module (guix git-download)
   #:use-module (guix build-system cargo)
+  #:use-module (rosenthal utils cargo)
   #:use-module (gnu packages llvm)
   #:use-module (gnu packages pkg-config)
-  #:use-module (gnu packages xorg)
-  #:use-module (rosenthal packages rust-crates))
+  #:use-module (gnu packages xorg))
 
 (define-public xwayland-satellite
   (package
diff --git a/modules/rosenthal/utils/cargo.scm b/modules/rosenthal/utils/cargo.scm
new file mode 100644
index 0000000..044d5b2
--- /dev/null
+++ b/modules/rosenthal/utils/cargo.scm
@@ -0,0 +1,17 @@
+;;; SPDX-FileCopyrightText: 2025 Hilton Chain <hako@ultrarare.space>
+;;;
+;;; SPDX-License-Identifier: GPL-3.0-or-later
+
+(define-module (rosenthal utils cargo)
+  #:use-module (guix diagnostics)
+  #:use-module (guix i18n)
+  #:export (rosenthal-cargo-inputs))
+
+(define* (rosenthal-cargo-inputs name #:key (module '(rosenthal packages rust-crates)))
+  "Lookup Cargo inputs for NAME defined in MODULE, return an empty list if
+unavailable."
+  (let ((lookup (module-ref (resolve-interface module) 'lookup-cargo-inputs)))
+    (or (lookup name)
+        (begin
+          (warning (G_ "no Cargo inputs available for '~a'~%") name)
+          '()))))