Compare commits

..

3 Commits

Author SHA1 Message Date
Hilton Chain
e4496a50ad
rosenthal: forgejo: Update to 11.0.1.
* modules/rosenthal/packages/web.scm (forgejo): Update to 11.0.1.
[arguments]<#:go>: Use go-1.24.
<#:build-flags>: Adjust according to import path change.
<#:phases>: Likewise.
2025-05-17 19:19:49 +08:00
Hilton Chain
2748dca5eb
rosenthal: Add emacs-caddyfile-mode.
* modules/rosenthal/packages/emacs-xyz.scm (emacs-caddyfile-mode): New
variable.
2025-05-17 16:57:32 +08:00
Hilton Chain
1653fe453d
rosenthal: ohmyech-icecat: Add source file name.
* modules/rosenthal/packages/browser-extensions.scm (ohmyech)[source]: Add
file name.
2025-05-17 16:52:29 +08:00
3 changed files with 39 additions and 13 deletions

View File

@ -1,4 +1,4 @@
;; SPDX-FileCopyrightText: 2023-2024 Hilton Chain <hako@ultrarare.space> ;; SPDX-FileCopyrightText: 2023-2025 Hilton Chain <hako@ultrarare.space>
;; ;;
;; SPDX-License-Identifier: GPL-3.0-or-later ;; SPDX-License-Identifier: GPL-3.0-or-later
@ -108,6 +108,7 @@ results are added in a sidebar next to search engine results.")
(uri (git-reference (uri (git-reference
(url "https://github.com/27justin/ohmyech") (url "https://github.com/27justin/ohmyech")
(commit "ec7935d500a9d354776586e25261cef3595c40c7"))) (commit "ec7935d500a9d354776586e25261cef3595c40c7")))
(file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1mrbm8c8z9zpfrs0qk5qj64f35p7c5lrxfn3nhda0ar0b2rv6593")) "1mrbm8c8z9zpfrs0qk5qj64f35p7c5lrxfn3nhda0ar0b2rv6593"))

View File

@ -8,7 +8,32 @@
#:use-module (guix gexp) #:use-module (guix gexp)
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix git-download) #:use-module (guix git-download)
#:use-module (guix packages)) #:use-module (guix packages)
#:use-module (gnu packages emacs-xyz))
(define-public emacs-caddyfile-mode
(let ((commit "fc41148f5a7eb320f070666f046fb9d88cf17680")
(revision "0"))
(package
(name "emacs-caddyfile-mode")
(version (git-version "0.2" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/Schnouki/caddyfile-mode")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"1s9kbav5wbyividn9zncd153h89nil0i9aj9hgxa95q9fy84r23w"))))
(build-system emacs-build-system)
(propagated-inputs (list emacs-loop))
(home-page "https://github.com/Schnouki/caddyfile-mode")
(synopsis "Emacs major mode for editing Caddy configuration files")
(description
"This package provides @code{caddyfile-mode}, an Emacs major mode for
editing Caddyfiles, configuration files for @code{caddy}.")
(license license:gpl3+))))
(define-public emacs-nftables-mode (define-public emacs-nftables-mode
(package (package

View File

@ -188,7 +188,7 @@ pipelines, Hugo renders a complete site in seconds, often less.")
(define-public forgejo (define-public forgejo
(package (package
(name "forgejo") (name "forgejo")
(version "10.0.3") (version "11.0.1")
;; TODO: Address npm dependencies and fetch from git. ;; TODO: Address npm dependencies and fetch from git.
(source (origin (source (origin
(method url-fetch) (method url-fetch)
@ -197,7 +197,7 @@ pipelines, Hugo renders a complete site in seconds, often less.")
version "/forgejo-src-" version ".tar.gz")) version "/forgejo-src-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0cqp4x3xrvr7q1pkijqmf6jnx3wahi20xjfrv7ap81ykif83269x")) "1mpdbwq3h0l5yk8f2sjpnyr0b6wngryx3238166rf7l2k5869bmq"))
(modules '((guix build utils))) (modules '((guix build utils)))
;; Avoid downloading toolchain. ;; Avoid downloading toolchain.
(snippet '(substitute* "go.mod" (snippet '(substitute* "go.mod"
@ -205,7 +205,7 @@ pipelines, Hugo renders a complete site in seconds, often less.")
(build-system go-build-system) (build-system go-build-system)
(arguments (arguments
(list #:tests? (not (%current-target-system)) ;TODO: Run test suite. (list #:tests? (not (%current-target-system)) ;TODO: Run test suite.
#:go go-1.23 #:go go-1.24
#:install-source? #f #:install-source? #f
#:import-path "." #:import-path "."
#:build-flags #:build-flags
@ -214,9 +214,9 @@ pipelines, Hugo renders a complete site in seconds, often less.")
" -X main.ReleaseVersion=" #$(package-version this-package) " -X main.ReleaseVersion=" #$(package-version this-package)
" -X main.Version=" #$(package-version this-package) " -X main.Version=" #$(package-version this-package)
" -X main.ForgejoVersion=" #$(package-version this-package) " -X main.ForgejoVersion=" #$(package-version this-package)
" -X code.gitea.io/gitea/modules/setting.AppWorkPath=/var/lib/forgejo" " -X forgejo.org/modules/setting.AppWorkPath=/var/lib/forgejo"
" -X code.gitea.io/gitea/modules/setting.CustomPath=" #$output "/etc/forgejo" " -X forgejo.org/modules/setting.CustomPath=" #$output "/etc/forgejo"
" -X code.gitea.io/gitea/modules/setting.CustomConf=/etc/forgejo/app.ini")) " -X forgejo.org/modules/setting.CustomConf=/etc/forgejo/app.ini"))
#:modules #:modules
'(((guix build gnu-build-system) #:prefix gnu:) '(((guix build gnu-build-system) #:prefix gnu:)
(guix build go-build-system) (guix build go-build-system)
@ -232,7 +232,7 @@ pipelines, Hugo renders a complete site in seconds, often less.")
(assoc-ref gnu:%standard-phases 'install-license-files)) (assoc-ref gnu:%standard-phases 'install-license-files))
(add-after 'install 'rename-binary (add-after 'install 'rename-binary
(lambda _ (lambda _
(rename-file (in-vicinity #$output "bin/gitea") (rename-file (in-vicinity #$output "bin/forgejo.org")
(in-vicinity #$output "bin/forgejo")))) (in-vicinity #$output "bin/forgejo"))))
(add-after 'install 'install-extras (add-after 'install 'install-extras
(lambda _ (lambda _
@ -245,12 +245,12 @@ pipelines, Hugo renders a complete site in seconds, often less.")
dir (string-append #$output "/etc/forgejo/" dir))) dir (string-append #$output "/etc/forgejo/" dir)))
'("options" "public" "templates")))) '("options" "public" "templates"))))
(delete 'check) (delete 'check)
(add-after 'install 'check (add-after 'rename-binary 'check
(lambda* (#:key tests? #:allow-other-keys) (lambda* (#:key tests? #:allow-other-keys)
(when tests? (when tests?
(let ((gitea (in-vicinity #$output "bin/gitea"))) (let ((forgejo (in-vicinity #$output "bin/forgejo")))
(invoke gitea "--help") (invoke forgejo "--help")
(invoke gitea "--version")))))))) (invoke forgejo "--version"))))))))
(native-inputs (list git-minimal)) (native-inputs (list git-minimal))
(home-page "https://forgejo.org/") (home-page "https://forgejo.org/")
(synopsis "Lightweight software forge") (synopsis "Lightweight software forge")