modules/rosenthal/packages/browser-extensions.scm

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

modules/rosenthal/packages/emacs-xyz.scm

@@ -8,32 +8,7 @@
   #:use-module (guix gexp)
   #:use-module (guix download)
   #:use-module (guix git-download)
-  #: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+))))
+  #:use-module (guix packages))
 
 (define-public emacs-nftables-mode
   (package

modules/rosenthal/packages/web.scm

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