seasharp/Rosenthal
1
0
Fork 0
mirror of https://codeberg.org/hako/Rosenthal.git synced 2025-11-04 03:34:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

rosenthal: rosenthal-cargo-inputs: Move to (rosenthal utils cargo).

Browse Source 
* 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
This commit is contained in:
Hilton Chain 2025-05-15 19:44:32 +08:00
parent 51a983adf3
commit cf5fc0ef73
No known key found for this signature in database
GPG Key ID: ACC66D09CA528292
5 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/rosenthal/packages/rust-apps.scm
View File

@ -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

14
modules/rosenthal/packages/rust-crates.scm
View File

@ -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.

4
modules/rosenthal/packages/wm.scm
View File

@ -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")

4
modules/rosenthal/packages/xorg.scm
View File

@ -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

17
modules/rosenthal/utils/cargo.scm Normal file
View File

@ -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)
'()))))