From 8ab6e64fe40afa249d9d2e61426a6f6c5130436c Mon Sep 17 00:00:00 2001 From: Hilton Chain Date: Sat, 24 May 2025 16:54:56 +0800 Subject: [PATCH] =?UTF-8?q?maint:=20Replace=20property=20=E2=80=98rosentha?= =?UTF-8?q?l-update=3F=E2=80=99=20with=20=E2=80=98disable-updater=3F?= =?UTF-8?q?=E2=80=99.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * modules/rosenthal/packages.scm (rosenthal-disable-updater?): New procedure. --- etc/manifests/auto-update.scm | 10 ++-------- etc/manifests/manual-update.scm | 10 ++-------- modules/rosenthal/packages.scm | 6 +++++- modules/rosenthal/packages/bootloaders.scm | 2 +- modules/rosenthal/packages/browser-extensions.scm | 12 ++++++------ modules/rosenthal/packages/busybox.scm | 2 +- modules/rosenthal/packages/dns.scm | 2 +- modules/rosenthal/packages/emacs-xyz.scm | 8 ++++---- modules/rosenthal/packages/golang.scm | 4 ++-- modules/rosenthal/packages/networking.scm | 2 +- modules/rosenthal/packages/rust-apps.scm | 2 +- modules/rosenthal/packages/ssh.scm | 2 +- modules/rosenthal/packages/tree-sitter.scm | 2 +- modules/rosenthal/packages/video.scm | 2 +- modules/rosenthal/packages/web.scm | 5 +++-- modules/rosenthal/packages/wm.scm | 6 +++--- 16 files changed, 35 insertions(+), 42 deletions(-) diff --git a/etc/manifests/auto-update.scm b/etc/manifests/auto-update.scm index 9f104e8..9a0a774 100644 --- a/etc/manifests/auto-update.scm +++ b/etc/manifests/auto-update.scm @@ -2,15 +2,9 @@ ;; ;; SPDX-License-Identifier: CC0-1.0 -(use-modules (guix packages) - (guix profiles) +(use-modules (guix profiles) (rosenthal packages)) -(define (disable-updater? p) - (let ((properties (package-properties p))) - (and (assq 'rosenthal-update? properties) - (not (assq-ref properties 'rosenthal-update?))))) - (manifest (map package->manifest-entry - (filter (negate disable-updater?) + (filter (negate rosenthal-disable-updater?) (all-rosenthal-packages)))) diff --git a/etc/manifests/manual-update.scm b/etc/manifests/manual-update.scm index e4185c2..586bc2c 100644 --- a/etc/manifests/manual-update.scm +++ b/etc/manifests/manual-update.scm @@ -2,15 +2,9 @@ ;; ;; SPDX-License-Identifier: CC0-1.0 -(use-modules (guix packages) - (guix profiles) +(use-modules (guix profiles) (rosenthal packages)) -(define (disable-updater? p) - (let ((properties (package-properties p))) - (and (assq 'rosenthal-update? properties) - (not (assq-ref properties 'rosenthal-update?))))) - (manifest (map package->manifest-entry - (filter disable-updater? + (filter rosenthal-disable-updater? (all-rosenthal-packages)))) diff --git a/modules/rosenthal/packages.scm b/modules/rosenthal/packages.scm index f729904..135b76f 100644 --- a/modules/rosenthal/packages.scm +++ b/modules/rosenthal/packages.scm @@ -16,7 +16,8 @@ search-patch) #:export (rosenthal-patches %rosenthal-package-module-path - all-rosenthal-packages)) + all-rosenthal-packages + rosenthal-disable-updater?)) ;;; Commentary: ;;; @@ -99,3 +100,6 @@ packages, excluding superseded packages." (all-modules %rosenthal-package-module-path #:warn warn-about-load-error) ;; Dismiss deprecated packages but keep hidden packages. #:select? (negate package-superseded)))) + +(define (rosenthal-disable-updater? p) + (assq-ref (package-properties p) 'disable-updater?)) diff --git a/modules/rosenthal/packages/bootloaders.scm b/modules/rosenthal/packages/bootloaders.scm index 7aab355..b111cb3 100644 --- a/modules/rosenthal/packages/bootloaders.scm +++ b/modules/rosenthal/packages/bootloaders.scm @@ -50,4 +50,4 @@ (append autoconf automake python-minimal-wrapper))) (properties `(,@(package-properties base) - (rosenthal-update? . #f)))))) + (disable-updater? . #t)))))) diff --git a/modules/rosenthal/packages/browser-extensions.scm b/modules/rosenthal/packages/browser-extensions.scm index f04071a..ab58ecc 100644 --- a/modules/rosenthal/packages/browser-extensions.scm +++ b/modules/rosenthal/packages/browser-extensions.scm @@ -36,7 +36,7 @@ (properties '((addon-id . "{446900e4-71c2-419f-a6a7-df9c091e268b}") (hidden? . #t) - (rosenthal-update? . #f))))) + (disable-updater? . #t))))) (define-public bitwarden/icecat (let ((base (make-icecat-extension bitwarden))) @@ -44,7 +44,7 @@ (inherit base) (properties `(,@(alist-delete 'hidden? (package-properties base)) - (rosenthal-update? . #f)))))) + (disable-updater? . #t)))))) (define-public miniflux-injector (package @@ -53,7 +53,7 @@ (properties '((addon-id . "{528ec801-2e29-4cb9-ae71-5a90503138d1}") (hidden? . #t) - (rosenthal-update? . #f))) + (disable-updater? . #t))) (source (origin (method url-fetch/zipbomb) @@ -93,7 +93,7 @@ results are added in a sidebar next to search engine results.") (inherit base) (properties `(,@(alist-delete 'hidden? (package-properties base)) - (rosenthal-update? . #f)))))) + (disable-updater? . #t)))))) (define-public ohmyech (package @@ -102,7 +102,7 @@ results are added in a sidebar next to search engine results.") (properties '((addon-id . "{46b8ab0b-8adf-4e43-ad67-acef5a8d45c9}") (hidden? . #t) - (rosenthal-update? . #f))) + (disable-updater? . #t))) (source (origin (method git-fetch) (uri (git-reference @@ -143,4 +143,4 @@ during the @acronym{TLS, Transport Layer Security} handshake process.") (inherit base) (properties `(,@(alist-delete 'hidden? (package-properties base)) - (rosenthal-update? . #f)))))) + (disable-updater? . #t)))))) diff --git a/modules/rosenthal/packages/busybox.scm b/modules/rosenthal/packages/busybox.scm index 4aac0d8..ad378b1 100644 --- a/modules/rosenthal/packages/busybox.scm +++ b/modules/rosenthal/packages/busybox.scm @@ -28,4 +28,4 @@ (delete-file "testsuite/mdev.tests"))))))) (properties `(,@(package-properties base) - (rosenthal-update? . #f)))))) + (disable-updater? . #t)))))) diff --git a/modules/rosenthal/packages/dns.scm b/modules/rosenthal/packages/dns.scm index ab391be..242077d 100644 --- a/modules/rosenthal/packages/dns.scm +++ b/modules/rosenthal/packages/dns.scm @@ -60,4 +60,4 @@ time. @end itemize") (license license:wtfpl2) (properties - '((rosenthal-update? . #f)))))) + '((disable-updater? . #t)))))) diff --git a/modules/rosenthal/packages/emacs-xyz.scm b/modules/rosenthal/packages/emacs-xyz.scm index 6585381..9e3833a 100644 --- a/modules/rosenthal/packages/emacs-xyz.scm +++ b/modules/rosenthal/packages/emacs-xyz.scm @@ -35,7 +35,7 @@ editing Caddyfiles, configuration files for @code{caddy}.") (license license:gpl3+) (properties - '((rosenthal-update? . #f)))))) + '((disable-updater? . #t)))))) (define-public emacs-nftables-mode (package @@ -79,7 +79,7 @@ It currently only offers basic highlighting and primitive indentation.") and it's subcommands.") (license license:gpl3+) (properties - '((rosenthal-update? . #f)))))) + '((disable-updater? . #t)))))) (define-public emacs-treesit-auto (package @@ -104,7 +104,7 @@ major modes and falling back to the original major mode when its tree-sitter counterpart is unavailable.") (license license:gpl3+) (properties - '((rosenthal-update? . #f))))) + '((disable-updater? . #t))))) ;; https://issues.guix.gnu.org/59552 (define-public emacs-wakatime-mode @@ -137,4 +137,4 @@ counterpart is unavailable.") metrics generated from your programming activity.") (license license:gpl3+) (properties - '((rosenthal-update? . #f)))))) + '((disable-updater? . #t)))))) diff --git a/modules/rosenthal/packages/golang.scm b/modules/rosenthal/packages/golang.scm index 5cab41e..794da31 100644 --- a/modules/rosenthal/packages/golang.scm +++ b/modules/rosenthal/packages/golang.scm @@ -27,7 +27,7 @@ (alist-replace "go" (list go-1.22) (package-native-inputs go-1.23))) (properties `(,@(package-properties go-1.23) - (rosenthal-update? . #f))))) + (disable-updater? . #t))))) (define-public go-cloudflare (let ((commit "37bc41c6ff79507200a315b72834fce6ca427a7e") @@ -49,4 +49,4 @@ (synopsis "Go with Cloudflare experimental patches") (properties `(,@(package-properties go-1.22) - (rosenthal-update? . #f)))))) + (disable-updater? . #t)))))) diff --git a/modules/rosenthal/packages/networking.scm b/modules/rosenthal/packages/networking.scm index 811c6bf..dee1c1f 100644 --- a/modules/rosenthal/packages/networking.scm +++ b/modules/rosenthal/packages/networking.scm @@ -248,7 +248,7 @@ can be used to create network proxy servers, clients and transparent proxies.") a SOCKS5 proxy.") (license license:expat) (properties - '((rosenthal-update? . #f))))) + '((disable-updater? . #t))))) (define-public tailscale (package diff --git a/modules/rosenthal/packages/rust-apps.scm b/modules/rosenthal/packages/rust-apps.scm index 00dbf4c..c9cbbfd 100644 --- a/modules/rosenthal/packages/rust-apps.scm +++ b/modules/rosenthal/packages/rust-apps.scm @@ -76,4 +76,4 @@ additional context for commands. Additionally, it provides optional and fully encrypted synchronisation of history between machines, via an Atuin server.") (license license:expat) (properties - '((rosenthal-update? . #f))))) + '((disable-updater? . #t))))) diff --git a/modules/rosenthal/packages/ssh.scm b/modules/rosenthal/packages/ssh.scm index ced3e50..cbbb48d 100644 --- a/modules/rosenthal/packages/ssh.scm +++ b/modules/rosenthal/packages/ssh.scm @@ -26,4 +26,4 @@ (replace "libtommath" `(,libtommath "static")))) (properties `(,@(package-properties base) - (rosenthal-update? . #f)))))) + (disable-updater? . #t)))))) diff --git a/modules/rosenthal/packages/tree-sitter.scm b/modules/rosenthal/packages/tree-sitter.scm index f47c87e..82f6f8d 100644 --- a/modules/rosenthal/packages/tree-sitter.scm +++ b/modules/rosenthal/packages/tree-sitter.scm @@ -37,4 +37,4 @@ (append '(#:tests? #f) ;FIXME (package-arguments base))) (properties - '((rosenthal-update? . #f)))))) + '((disable-updater? . #t)))))) diff --git a/modules/rosenthal/packages/video.scm b/modules/rosenthal/packages/video.scm index c5fc8e6..c6e1371 100644 --- a/modules/rosenthal/packages/video.scm +++ b/modules/rosenthal/packages/video.scm @@ -23,4 +23,4 @@ (delete "libx11" "libxext" "libxfixes"))) (properties `(,@(package-properties base) - (rosenthal-update? . #f)))))) + (disable-updater? . #t)))))) diff --git a/modules/rosenthal/packages/web.scm b/modules/rosenthal/packages/web.scm index 6d37a23..fe6ba33 100644 --- a/modules/rosenthal/packages/web.scm +++ b/modules/rosenthal/packages/web.scm @@ -163,7 +163,8 @@ from serving static websites to running dynamic web applications.") (sha256 (base32 "0m01p9y96m1krjg1rf53kndxklql8i4hfv09rc3xnxbmqh5ahm43")))))) - (home-page "https://git.boiledscript.com/hako/caddy"))) + (home-page "https://git.boiledscript.com/hako/caddy") + (properties '((disable-updater? . #t))))) (define-public hugo (package @@ -323,4 +324,4 @@ install and maintain, making it an ideal choice for teams and organizations looking for a reliable platform to manage their software projects.") (license license:gpl3+) (properties - '((rosenthal-update? . #f))))) + '((disable-updater? . #t))))) diff --git a/modules/rosenthal/packages/wm.scm b/modules/rosenthal/packages/wm.scm index 38d25c8..c1e8742 100644 --- a/modules/rosenthal/packages/wm.scm +++ b/modules/rosenthal/packages/wm.scm @@ -69,7 +69,7 @@ (license license:expat) (properties '((hidden? . #t) - (rosenthal-update? . #f)))))) + (disable-updater? . #t)))))) (define-public rust-smithay (let ((commit "0cd3345c59f7cb139521f267956a1a4e33248393") @@ -122,7 +122,7 @@ extensions, such as @code{wlr-protocols} and @code{plasma-wayland-protocols}.") (license license:expat) (properties '((hidden? . #t) - (rosenthal-update? . #f)))))) + (disable-updater? . #t)))))) (define-public niri (package @@ -194,4 +194,4 @@ scrollable format. It is considered stable for daily use and performs most functions expected of a Wayland compositor.") (license license:gpl3) (properties - '((rosenthal-update? . #f))))) + '((disable-updater? . #t)))))