Compare commits

..

No commits in common. "eabcecfe5c3c0e6a0ee480caa19abe01bef94008" and "ab429bcc1f784f433ca7da588440434f10ae2dce" have entirely different histories.

4 changed files with 26 additions and 37 deletions

View File

@ -1,10 +0,0 @@
#!/bin/sh
# SPDX-FileCopyrightText: 2026 Hilton Chain <hako@ultrarare.space>
#
# SPDX-License-Identifier: CC0-1.0
grep --recursive --no-filename '^;;guix:' . |
sed --regexp-extended 's/^;;guix:(.*)/"\1"/g' |
xargs guix install emacs-pgtk
[[ ! -e ~/.config/emacs/init.el ]] && cp --recursive . ~/.config/emacs

View File

@ -134,7 +134,7 @@ host Matrix for your family, friends or company.")
(define-public tuwunel-bin (define-public tuwunel-bin
(package (package
(name "tuwunel-bin") (name "tuwunel-bin")
(version "1.4.9.1") (version "1.4.5")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -144,7 +144,7 @@ host Matrix for your family, friends or company.")
(file-name (string-append name "-" version ".zst")) (file-name (string-append name "-" version ".zst"))
(sha256 (sha256
(base32 (base32
"078d978xy84fw42y7wkl97gmfqyfn2j3vhh8k7ywkgh9lhi30mbn")))) "1zmcaqb7hgzpls0crx1rgicqz1pgs4ykgjkzlzsgpbkdrad4jbip"))))
(build-system copy-build-system) (build-system copy-build-system)
(arguments (arguments
(list #:install-plan (list #:install-plan
@ -172,7 +172,7 @@ the most niche uses.")
(define-public komga-bin (define-public komga-bin
(package (package
(name "komga-bin") (name "komga-bin")
(version "1.23.6") (version "1.22.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -180,7 +180,7 @@ the most niche uses.")
"/komga-" version ".jar")) "/komga-" version ".jar"))
(sha256 (sha256
(base32 (base32
"01mkhdxd2gh75g46381j5c4frys1bq5rywmb700ma5bdy7vd8k9i")))) "0y3khm3q4mh1qrbklzjn1ac7xgb1g21qw3fn9vxmjsvghanhf0rh"))))
(build-system copy-build-system) (build-system copy-build-system)
(arguments (arguments
(list #:install-plan (list #:install-plan
@ -220,7 +220,7 @@ eBooks.")
(define-public navidrome-bin (define-public navidrome-bin
(package (package
(name "navidrome-bin") (name "navidrome-bin")
(version "0.59.0") (version "0.57.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -228,7 +228,7 @@ eBooks.")
version "/navidrome_" version "_linux_amd64.tar.gz")) version "/navidrome_" version "_linux_amd64.tar.gz"))
(sha256 (sha256
(base32 (base32
"1fn8hj6hm72nsyw69l5asqd1hm13z564ikk9v7nzg417553asx0h")))) "0v2av7q9sfsm17m03xdzb7afn3hlqb2vj3ps0xwsa8x7yza4j3fb"))))
(build-system copy-build-system) (build-system copy-build-system)
(arguments (arguments
(list #:install-plan (list #:install-plan
@ -278,7 +278,7 @@ monster-in-the-middle}.")
(define-public wakapi-bin (define-public wakapi-bin
(package (package
(name "wakapi-bin") (name "wakapi-bin")
(version "2.17.1") (version "2.14.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -286,7 +286,7 @@ monster-in-the-middle}.")
version "/wakapi_linux_amd64.zip")) version "/wakapi_linux_amd64.zip"))
(sha256 (sha256
(base32 (base32
"0gb75wlip98187wc933p1cabsghh9w6lrh87nk3f2nhy86i2b5m7")))) "1qfm3di3bfk7pc6ks22287hib7jk57ilvsy3hm42xvv2fhk77m69"))))
(build-system copy-build-system) (build-system copy-build-system)
(arguments (list #:install-plan #~'(("wakapi" "bin/wakapi")))) (arguments (list #:install-plan #~'(("wakapi" "bin/wakapi"))))
(supported-systems '("x86_64-linux")) (supported-systems '("x86_64-linux"))
@ -302,7 +302,7 @@ coding statistics.")
(define-public wakatime-cli-bin (define-public wakatime-cli-bin
(package (package
(name "wakatime-cli-bin") (name "wakatime-cli-bin")
(version "1.139.1") (version "1.124.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://github.com/wakatime/wakatime-cli" (uri (string-append "https://github.com/wakatime/wakatime-cli"
@ -310,7 +310,7 @@ coding statistics.")
"/wakatime-cli-linux-amd64.zip")) "/wakatime-cli-linux-amd64.zip"))
(sha256 (sha256
(base32 (base32
"11jl7riqnn7c4bphrxc19x8gw2x87a9ymp2qkdil2syk24gfrjw6")))) "16glv2x0n118dczgjfaz02dwq70ngcq4wqc3pswdjzkch79z109m"))))
(build-system copy-build-system) (build-system copy-build-system)
(arguments (arguments
(list #:install-plan (list #:install-plan
@ -418,7 +418,7 @@ multi-tenant, long-term storage for Prometheus.")
(define-public loki-bin (define-public loki-bin
(package (package
(name "loki-bin") (name "loki-bin")
(version "3.6.4") (version "3.5.4")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -426,7 +426,7 @@ multi-tenant, long-term storage for Prometheus.")
version "/loki-linux-amd64.zip")) version "/loki-linux-amd64.zip"))
(sha256 (sha256
(base32 (base32
"153kzznw9jc10bvkjyqckmbkh8f6xg1d83wbd5vlajdvmrhl4l2i")))) "1z1z60ki4zavijw0idpard0xx38q8140wv2hykxb3rikb05z0frk"))))
(build-system copy-build-system) (build-system copy-build-system)
(arguments (arguments
(list #:install-plan (list #:install-plan
@ -446,7 +446,7 @@ rather a set of labels for each log stream.")
(define-public alloy-bin (define-public alloy-bin
(package (package
(name "alloy-bin") (name "alloy-bin")
(version "1.12.2") (version "1.10.2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -454,7 +454,7 @@ rather a set of labels for each log stream.")
version "/alloy-linux-amd64.zip")) version "/alloy-linux-amd64.zip"))
(sha256 (sha256
(base32 (base32
"0fknk73z13a3jic6q3gmnwcgzz51jplikmg3xaz08217khpqh4kx")))) "03hwmnkx2awxlfw3ixplfnwzx7n1x624n1yw6cgky4hhjz13d3i8"))))
(build-system copy-build-system) (build-system copy-build-system)
(arguments (arguments
(list #:install-plan (list #:install-plan
@ -484,7 +484,7 @@ profiles.")
(package (package
(inherit alloy-bin) (inherit alloy-bin)
(name "alloy-bin-aarch64-linux") (name "alloy-bin-aarch64-linux")
(version "1.12.2") (version "1.10.2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -492,7 +492,7 @@ profiles.")
version "/alloy-linux-arm64.zip")) version "/alloy-linux-arm64.zip"))
(sha256 (sha256
(base32 (base32
"08k7dhj8dhdv5w2d6gkny31rp1p51ycd6f0mp5v13iq9w7d4w3bd")))) "1gnfdhs8rxyn18swy1kv1f2lbsj6abjlhrgaibsj2a87swgcyvjg"))))
(arguments (arguments
(substitute-keyword-arguments (package-arguments alloy-bin) (substitute-keyword-arguments (package-arguments alloy-bin)
((#:install-plan _ ''()) ((#:install-plan _ ''())

View File

@ -20,7 +20,7 @@
(define-public cloudflared (define-public cloudflared
(package (package
(name "cloudflared") (name "cloudflared")
(version "2026.1.1") (version "2025.11.1")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -32,7 +32,7 @@
;; (snippet '(delete-file-recursively "vendor")) ;; (snippet '(delete-file-recursively "vendor"))
(sha256 (sha256
(base32 (base32
"11bdgv12y6ys5p6sxr0b7mqirvwcpll1jpdsdmkiwrd95maq7rgp")))) "1lq6gf1xb2xr7rdi543k2z2csc2364jl5psj3sd33bvwd3147jis"))))
(build-system go-build-system) (build-system go-build-system)
(arguments (arguments
(list #:go go-1.24 (list #:go go-1.24

View File

@ -1,5 +1,5 @@
From 4d8509b60d17cc5d242d0bb157beef123dd28923 Mon Sep 17 00:00:00 2001 From 93295096bbc36a79e0e9d738a98b503af260f047 Mon Sep 17 00:00:00 2001
Message-ID: <4d8509b60d17cc5d242d0bb157beef123dd28923.1769270645.git.hako@ultrarare.space> Message-ID: <93295096bbc36a79e0e9d738a98b503af260f047.1769256978.git.hako@ultrarare.space>
From: Hilton Chain <hako@ultrarare.space> From: Hilton Chain <hako@ultrarare.space>
Date: Sat, 23 Aug 2025 14:07:19 +0800 Date: Sat, 23 Aug 2025 14:07:19 +0800
Subject: [PATCH] publish: Store cache in a layout identical to HTTP endpoints. Subject: [PATCH] publish: Store cache in a layout identical to HTTP endpoints.
@ -41,12 +41,12 @@ Modified layout:
Change-Id: I07689f08eef23c5cd4494451678f4e1ad709f1b3 Change-Id: I07689f08eef23c5cd4494451678f4e1ad709f1b3
--- ---
guix/scripts/publish.scm | 21 +++++++----------- guix/scripts/publish.scm | 20 ++++++-----------
tests/publish.scm | 48 ++++++++++++++++++++-------------------- tests/publish.scm | 48 ++++++++++++++++++++--------------------
2 files changed, 32 insertions(+), 37 deletions(-) 2 files changed, 31 insertions(+), 37 deletions(-)
diff --git a/guix/scripts/publish.scm b/guix/scripts/publish.scm diff --git a/guix/scripts/publish.scm b/guix/scripts/publish.scm
index 1143cd29cfd..24b7f40cbd7 100644 index 1143cd29cfd..b8d0c5dc7b3 100644
--- a/guix/scripts/publish.scm --- a/guix/scripts/publish.scm
+++ b/guix/scripts/publish.scm +++ b/guix/scripts/publish.scm
@@ -47,6 +47,7 @@ (define-module (guix scripts publish) @@ -47,6 +47,7 @@ (define-module (guix scripts publish)
@ -86,7 +86,7 @@ index 1143cd29cfd..24b7f40cbd7 100644
(define (hash-part-mapping-cache-file directory hash) (define (hash-part-mapping-cache-file directory hash)
(string-append directory "/hashes/" hash)) (string-append directory "/hashes/" hash))
@@ -533,11 +529,9 @@ (define* (render-narinfo/cached store request hash @@ -533,11 +529,8 @@ (define* (render-narinfo/cached store request hash
requested using POOL." requested using POOL."
(define (delete-entry narinfo) (define (delete-entry narinfo)
;; Delete NARINFO and the corresponding nar from CACHE. ;; Delete NARINFO and the corresponding nar from CACHE.
@ -95,13 +95,12 @@ index 1143cd29cfd..24b7f40cbd7 100644
- ".nar")) - ".nar"))
- (base (basename narinfo ".narinfo")) - (base (basename narinfo ".narinfo"))
- (hash (string-take base (string-index base #\-))) - (hash (string-take base (string-index base #\-)))
+ (let* ((path (uri-decode (assoc-ref (call-with-input-file narinfo recutils->alist) "URL"))) + (let* ((nar (uri-decode (assoc-ref (call-with-input-file narinfo recutils->alist) "URL")))
+ (nar (in-vicinity (dirname narinfo) path))
+ (hash (basename narinfo ".narinfo")) + (hash (basename narinfo ".narinfo"))
(mapping (hash-part-mapping-cache-file cache hash))) (mapping (hash-part-mapping-cache-file cache hash)))
(delete-file* narinfo) (delete-file* narinfo)
(delete-file* nar) (delete-file* nar)
@@ -1044,6 +1038,7 @@ (define (string->compression-type string) @@ -1044,6 +1037,7 @@ (define (string->compression-type string)
("gzip" 'gzip) ("gzip" 'gzip)
("lzip" 'lzip) ("lzip" 'lzip)
("zstd" 'zstd) ("zstd" 'zstd)