From 794db4f7027a42f46918e9d80739fa8f3243b2e4 Mon Sep 17 00:00:00 2001 From: Hilton Chain Date: Sat, 21 Mar 2026 00:07:40 +0800 Subject: [PATCH] rosenthal: Reference the inherited arguments and inputs values. Following upstream change in https://codeberg.org/guix/guix/commit/6b1a15189e9f02f2962c4885092533f817d0375c These references are found via: rg '\(package-(arguments|[a-z]*-?inputs)' No derivation changes are introduced by this commit. --- modules/rosenthal/packages/admin.scm | 42 +++++++++---------- modules/rosenthal/packages/busybox.scm | 2 +- modules/rosenthal/packages/emacs-xyz.scm | 4 +- .../rosenthal/packages/package-management.scm | 2 +- modules/rosenthal/packages/ssh.scm | 4 +- modules/rosenthal/packages/video.scm | 4 +- modules/rosenthal/packages/web.scm | 2 +- modules/rosenthal/packages/wm.scm | 2 +- modules/rosenthal/utils/packages.scm | 2 +- 9 files changed, 31 insertions(+), 33 deletions(-) diff --git a/modules/rosenthal/packages/admin.scm b/modules/rosenthal/packages/admin.scm index 78b1580..a895988 100644 --- a/modules/rosenthal/packages/admin.scm +++ b/modules/rosenthal/packages/admin.scm @@ -59,17 +59,16 @@ the user to manage services with dependencies and parallel startup.") (license license:asl2.0))) (define-public libseat-sans-logind - (let ((base libseat)) - (package - (inherit base) - (name "libseat-sans-logind") - (arguments - (substitute-keyword-arguments (package-arguments base) - ((#:configure-flags configure-flags) - #~(append #$configure-flags - (list "-Dlibseat-logind=disabled"))))) - (propagated-inputs '()) - (properties '((disable-updater? . #t)))))) + (package + (inherit libseat) + (name "libseat-sans-logind") + (arguments + (substitute-keyword-arguments arguments + ((#:configure-flags configure-flags) + #~(append #$configure-flags + (list "-Dlibseat-logind=disabled"))))) + (propagated-inputs '()) + (properties '((disable-updater? . #t))))) (define-public pam-dumb-runtime-dir (package @@ -109,14 +108,13 @@ exists and is only writable by root.") (license license:bsd-0))) (define-public seatd-sans-logind - (let ((base seatd)) - (package - (inherit base) - (name "seatd-sans-logind") - (arguments - (substitute-keyword-arguments (package-arguments base) - ((#:configure-flags configure-flags) - #~(append #$configure-flags - (list "-Dlibseat-logind=disabled"))))) - (propagated-inputs '()) - (properties '((disable-updater? . #t)))))) + (package + (inherit seatd) + (name "seatd-sans-logind") + (arguments + (substitute-keyword-arguments arguments + ((#:configure-flags configure-flags) + #~(append #$configure-flags + (list "-Dlibseat-logind=disabled"))))) + (propagated-inputs '()) + (properties '((disable-updater? . #t))))) diff --git a/modules/rosenthal/packages/busybox.scm b/modules/rosenthal/packages/busybox.scm index 1eb0aef..a7c903d 100644 --- a/modules/rosenthal/packages/busybox.scm +++ b/modules/rosenthal/packages/busybox.scm @@ -15,7 +15,7 @@ (inherit base) (name "busybox-static") (arguments - (substitute-keyword-arguments (package-arguments base) + (substitute-keyword-arguments arguments ((#:phases phases) #~(modify-phases #$phases (add-after 'configure 'static-build diff --git a/modules/rosenthal/packages/emacs-xyz.scm b/modules/rosenthal/packages/emacs-xyz.scm index 252e242..f9fe946 100644 --- a/modules/rosenthal/packages/emacs-xyz.scm +++ b/modules/rosenthal/packages/emacs-xyz.scm @@ -33,10 +33,10 @@ (base32 "0h0fxybdb23cyx4xqz4axyp4sbqi2bqcvcwqin74l59wmfwpz0rr")))) (arguments - (substitute-keyword-arguments (package-arguments emacs-arei) + (substitute-keyword-arguments arguments ((#:lisp-directory _ #f) "lisp"))) (propagated-inputs - (modify-inputs (package-propagated-inputs emacs-arei) + (modify-inputs propagated-inputs (prepend emacs-consult)))))) (define-public emacs-caddyfile-mode diff --git a/modules/rosenthal/packages/package-management.scm b/modules/rosenthal/packages/package-management.scm index 08252a1..6beeb15 100644 --- a/modules/rosenthal/packages/package-management.scm +++ b/modules/rosenthal/packages/package-management.scm @@ -20,6 +20,6 @@ "guix-wip-zfs-boot-support.patch"))) (name "guix-dolly") (arguments - (substitute-keyword-arguments (package-arguments guix) + (substitute-keyword-arguments arguments ((#:parallel-build? _ #f) #t))) (properties '((disable-updater? . #t))))) diff --git a/modules/rosenthal/packages/ssh.scm b/modules/rosenthal/packages/ssh.scm index 54957e3..b337816 100644 --- a/modules/rosenthal/packages/ssh.scm +++ b/modules/rosenthal/packages/ssh.scm @@ -17,11 +17,11 @@ (inherit dropbear) (name "dropbear-static") (arguments - (substitute-keyword-arguments (package-arguments base) + (substitute-keyword-arguments arguments ((#:configure-flags flags) #~(append #$flags (list "--enable-static"))))) (inputs - (modify-inputs (package-inputs base) + (modify-inputs inputs (append `(,zlib "static")) (replace "libtomcrypt" `(,libtomcrypt "static")) (replace "libtommath" `(,libtommath "static")))) diff --git a/modules/rosenthal/packages/video.scm b/modules/rosenthal/packages/video.scm index 1863f22..138ace0 100644 --- a/modules/rosenthal/packages/video.scm +++ b/modules/rosenthal/packages/video.scm @@ -15,12 +15,12 @@ (inherit base) (name "libva-nox") (arguments - (substitute-keyword-arguments (package-arguments base) + (substitute-keyword-arguments arguments ((#:configure-flags configure-flags) #~(append #$configure-flags (list "--disable-glx"))) ((#:phases _) #~%standard-phases))) (inputs - (modify-inputs (package-inputs base) + (modify-inputs inputs (delete "libx11" "libxext" "libxfixes"))) (properties `(,@(package-properties base) diff --git a/modules/rosenthal/packages/web.scm b/modules/rosenthal/packages/web.scm index 128d2ee..281e0a1 100644 --- a/modules/rosenthal/packages/web.scm +++ b/modules/rosenthal/packages/web.scm @@ -207,7 +207,7 @@ from serving static websites to running dynamic web applications.") (base32 "14vpk4939v67jiapl8yn3a2v0sfzblaajlzcqfqii2xcb3a290j3")))) (native-inputs - (modify-inputs (package-native-inputs caddy) + (modify-inputs native-inputs (replace "vendored-go-dependencies" (origin (method (go-mod-vendor #:go go-1.25)) diff --git a/modules/rosenthal/packages/wm.scm b/modules/rosenthal/packages/wm.scm index ffb5acb..dcadda1 100644 --- a/modules/rosenthal/packages/wm.scm +++ b/modules/rosenthal/packages/wm.scm @@ -167,7 +167,7 @@ supporting various Wayland compositors like @code{niri}, @code{hyprland}, and (sha256 (base32 "0pyakmaq2bwdhnnqnrsqm9g1mjf5spij6hsvmlw058kxj8xkbbd4")))) (inputs - (modify-inputs (package-inputs quickshell) + (modify-inputs inputs (prepend glib polkit))) (home-page "https://noctalia.dev/") (synopsis "QtQuick-based desktop shell toolkit (Noctalia fork)"))) diff --git a/modules/rosenthal/utils/packages.scm b/modules/rosenthal/utils/packages.scm index 042754a..0867e12 100644 --- a/modules/rosenthal/utils/packages.scm +++ b/modules/rosenthal/utils/packages.scm @@ -169,7 +169,7 @@ packages, excluding superseded packages." (version (package-version (assoc-ref source-mapping default-system))) (source #f) (arguments - (substitute-keyword-arguments (package-arguments p) + (substitute-keyword-arguments arguments ((#:phases phases #~%standard-phases) #~(modify-phases #$phases (replace 'unpack