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/x.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/x.go')
| -rw-r--r-- | internal/rosa/x.go | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/internal/rosa/x.go b/internal/rosa/x.go index 85abeeab..23ec203e 100644 --- a/internal/rosa/x.go +++ b/internal/rosa/x.go @@ -7,10 +7,10 @@ func (t Toolchain) newUtilMacros() (pkg.Artifact, string) { version = "1.20.2" checksum = "Ze8QH3Z3emC0pWFP-0nUYeMy7aBW3L_dxBBmVgcumIHNzEKc1iGTR-yUFR3JcM1G" ) - return t.NewPackage("util-macros", version, pkg.NewHTTPGetTar( - nil, "https://www.x.org/releases/individual/util/"+ + return t.NewPackage("util-macros", version, newTar( + "https://www.x.org/releases/individual/util/"+ "util-macros-"+version+".tar.gz", - mustDecode(checksum), + checksum, pkg.TarGzip, ), nil, (*MakeHelper)(nil)), version } @@ -31,10 +31,10 @@ func (t Toolchain) newXproto() (pkg.Artifact, string) { version = "7.0.31" checksum = "Cm69urWY5RctKpR78eGzuwrjDEfXGkvHRdodj6sjypOGy5FF4-lmnUttVHYV1ydg" ) - return t.NewPackage("xproto", version, pkg.NewHTTPGetTar( - nil, "https://www.x.org/releases/individual/proto/"+ + return t.NewPackage("xproto", version, newTar( + "https://www.x.org/releases/individual/proto/"+ "xproto-"+version+".tar.bz2", - mustDecode(checksum), + checksum, pkg.TarBzip2, ), nil, &MakeHelper{ // ancient configure script @@ -63,10 +63,10 @@ func (t Toolchain) newLibXau() (pkg.Artifact, string) { version = "1.0.12" checksum = "G9AjnU_C160q814MCdjFOVt_mQz_pIt4wf4GNOQmGJS3UuuyMw53sfPvJ7WOqwXN" ) - return t.NewPackage("libXau", version, pkg.NewHTTPGetTar( - nil, "https://www.x.org/releases/individual/lib/"+ + return t.NewPackage("libXau", version, newTar( + "https://www.x.org/releases/individual/lib/"+ "libXau-"+version+".tar.gz", - mustDecode(checksum), + checksum, pkg.TarGzip, ), nil, &MakeHelper{ // ancient configure script |