From 1107486c29a24c820ec67b3f8b9aacda4f15ccda Mon Sep 17 00:00:00 2001 From: Hilton Chain Date: Sat, 17 May 2025 16:17:37 +0800 Subject: [PATCH] rosenthal: bitwarden-icecat: Move to browser-extensions. * modules/rosenthal/packages/binaries.scm (bitwarden, bitwarden/icecat): Move to... * modules/rosenthal/packages/browser-extensions.scm (bitwarden) (bitwarden/icecat): ...here. --- modules/rosenthal/packages/binaries.scm | 34 ------------------ .../rosenthal/packages/browser-extensions.scm | 35 +++++++++++++++++++ 2 files changed, 35 insertions(+), 34 deletions(-) diff --git a/modules/rosenthal/packages/binaries.scm b/modules/rosenthal/packages/binaries.scm index e948676..592d014 100644 --- a/modules/rosenthal/packages/binaries.scm +++ b/modules/rosenthal/packages/binaries.scm @@ -30,40 +30,6 @@ (define-public atuin-bin (deprecated-package "atuin-bin" atuin)) -(define-public bitwarden - (package - (name "bitwarden") - (version "2025.3.1") - (source (origin - (method url-fetch/zipbomb) - (uri (string-append "https://github.com/bitwarden/clients" - "/releases/download/browser-v" version - "/dist-firefox-" version ".zip")) - (sha256 - (base32 - "03s8z32rc4mwzi61xpzn4f9z6kxwdnshqy61h2kr3cvq9974li3s")))) - (build-system copy-build-system) - (arguments - (list #:install-plan - #~'(("." #$(assq-ref (package-properties this-package) 'addon-id))))) - (home-page "https://bitwarden.com/") - (synopsis "Bitwarden client browser extension") - (description - "This package provides browser extension for Bitwarden client.") - (license license:gpl3) - (properties - '((addon-id . "{446900e4-71c2-419f-a6a7-df9c091e268b}") - (hidden? . #t) - (rosenthal-update? . #f))))) - -(define-public bitwarden/icecat - (let ((base (make-icecat-extension bitwarden))) - (package - (inherit base) - (properties - `(,@(alist-delete 'hidden? (package-properties base)) - (rosenthal-update? . #f)))))) - (define-public hugo-bin (deprecated-package "hugo-bin" hugo)) diff --git a/modules/rosenthal/packages/browser-extensions.scm b/modules/rosenthal/packages/browser-extensions.scm index 1705b95..e77425e 100644 --- a/modules/rosenthal/packages/browser-extensions.scm +++ b/modules/rosenthal/packages/browser-extensions.scm @@ -7,10 +7,45 @@ #:use-module (guix gexp) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) + #:use-module (guix download) #:use-module (guix git-download) #:use-module (guix build-system copy) #:use-module (gnu build icecat-extension)) +(define-public bitwarden + (package + (name "bitwarden") + (version "2025.3.1") + (source (origin + (method url-fetch/zipbomb) + (uri (string-append "https://github.com/bitwarden/clients" + "/releases/download/browser-v" version + "/dist-firefox-" version ".zip")) + (sha256 + (base32 + "03s8z32rc4mwzi61xpzn4f9z6kxwdnshqy61h2kr3cvq9974li3s")))) + (build-system copy-build-system) + (arguments + (list #:install-plan + #~'(("." #$(assq-ref (package-properties this-package) 'addon-id))))) + (home-page "https://bitwarden.com/") + (synopsis "Bitwarden client browser extension") + (description + "This package provides browser extension for Bitwarden client.") + (license license:gpl3) + (properties + '((addon-id . "{446900e4-71c2-419f-a6a7-df9c091e268b}") + (hidden? . #t) + (rosenthal-update? . #f))))) + +(define-public bitwarden/icecat + (let ((base (make-icecat-extension bitwarden))) + (package + (inherit base) + (properties + `(,@(alist-delete 'hidden? (package-properties base)) + (rosenthal-update? . #f)))))) + (define-public ohmyech (package (name "ohmyech")