diff options
| author | Ophestra <cat@gensokyo.uk> | 2026-04-13 15:23:41 +0900 |
|---|---|---|
| committer | Ophestra <cat@gensokyo.uk> | 2026-04-13 18:02:57 +0900 |
| commit | 83b0e32c550bf47eea826be7403183bf8f412850 (patch) | |
| tree | abfe8a5c2aec066a705ba92405b8366ebcd973b2 /internal/rosa/dbus.go | |
| parent | eeaf26e7a24c5c51c64fc333284015224e851e8c (diff) | |
internal/rosa: helpers for common url formats
This cleans up call site of NewPackage.
Signed-off-by: Ophestra <cat@gensokyo.uk>
Diffstat (limited to 'internal/rosa/dbus.go')
| -rw-r--r-- | internal/rosa/dbus.go | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/internal/rosa/dbus.go b/internal/rosa/dbus.go index b27d85a8..1e271c50 100644 --- a/internal/rosa/dbus.go +++ b/internal/rosa/dbus.go @@ -7,11 +7,11 @@ func (t Toolchain) newDBus() (pkg.Artifact, string) { version = "1.16.2" checksum = "INwOuNdrDG7XW5ilW_vn8JSxEa444rRNc5ho97i84I1CNF09OmcFcV-gzbF4uCyg" ) - return t.NewPackage("dbus", version, pkg.NewHTTPGetTar( - nil, "https://gitlab.freedesktop.org/dbus/dbus/-/archive/"+ - "dbus-"+version+"/dbus-dbus-"+version+".tar.bz2", - mustDecode(checksum), - pkg.TarBzip2, + return t.NewPackage("dbus", version, newFromGitLab( + "gitlab.freedesktop.org", + "dbus/dbus", + "dbus-"+version, + checksum, ), &PackageAttr{ // OSError: [Errno 30] Read-only file system: '/usr/src/dbus/subprojects/packagecache' Writable: true, @@ -50,11 +50,10 @@ func (t Toolchain) newXDGDBusProxy() (pkg.Artifact, string) { version = "0.1.7" checksum = "UW5Pe-TP-XAaN-kTbxrkOQ7eYdmlAQlr2pdreLtPT0uwdAz-7rzDP8V_8PWuZBup" ) - return t.NewPackage("xdg-dbus-proxy", version, pkg.NewHTTPGetTar( - nil, "https://github.com/flatpak/xdg-dbus-proxy/archive/"+ - "refs/tags/"+version+".tar.gz", - mustDecode(checksum), - pkg.TarGzip, + return t.NewPackage("xdg-dbus-proxy", version, newFromGitHub( + "flatpak/xdg-dbus-proxy", + version, + checksum, ), nil, &MesonHelper{ Setup: []KV{ {"Dman", "disabled"}, |