internal/rosa: pass stage alongside state

This cleans up many function signatures.

Signed-off-by: Ophestra <cat@gensokyo.uk>

1 files changed, 56 insertions, 56 deletions

diff --git a/internal/rosa/x.go b/internal/rosa/x.go
index 5806d967..89ef7e46 100644
--- a/internal/rosa/x.go
+++ b/internal/rosa/x.go
@@ -2,12 +2,12 @@ package rosa
 
 import "hakurei.app/internal/pkg"
 
-func (t Toolchain) newUtilMacros(s *S) (pkg.Artifact, string) {
+func (t Toolchain) newUtilMacros() (pkg.Artifact, string) {
 	const (
 		version  = "1.20.2"
 		checksum = "Ze8QH3Z3emC0pWFP-0nUYeMy7aBW3L_dxBBmVgcumIHNzEKc1iGTR-yUFR3JcM1G"
 	)
-	return s.NewPackage(t, "util-macros", version, newTar(
+	return t.NewPackage("util-macros", version, newTar(
 		"https://www.x.org/releases/individual/util/"+
 			"util-macros-"+version+".tar.gz",
 		checksum,
@@ -26,12 +26,12 @@ func init() {
 	})
 }
 
-func (t Toolchain) newLibxtrans(s *S) (pkg.Artifact, string) {
+func (t Toolchain) newLibxtrans() (pkg.Artifact, string) {
 	const (
 		version  = "1.6.0"
 		checksum = "1cxDCF59fLf1HyGDMcjR1L50ZbjD0RTTEDUpOJYcHXu6HUK_Ds0x-KREY7rLNxu9"
 	)
-	return s.NewPackage(t, "libxtrans", version, newFromGitLab(
+	return t.NewPackage("libxtrans", version, newFromGitLab(
 		"gitlab.freedesktop.org",
 		"xorg/lib/libxtrans",
 		"xtrans-"+version,
@@ -58,12 +58,12 @@ func init() {
 	})
 }
 
-func (t Toolchain) newXorgProto(s *S) (pkg.Artifact, string) {
+func (t Toolchain) newXorgProto() (pkg.Artifact, string) {
 	const (
 		version  = "2025.1"
 		checksum = "pTwJiBJHKA6Rgm3cVDXy1lyvXNIUzTRaukvvYdk1xWoJ_1G-Dfjm9MyewuyIjoHz"
 	)
-	return s.NewPackage(t, "xorgproto", version, newFromGitLab(
+	return t.NewPackage("xorgproto", version, newFromGitLab(
 		"gitlab.freedesktop.org",
 		"xorg/proto/xorgproto",
 		"xorgproto-"+version,
@@ -89,12 +89,12 @@ func init() {
 	})
 }
 
-func (t Toolchain) newLibXau(s *S) (pkg.Artifact, string) {
+func (t Toolchain) newLibXau() (pkg.Artifact, string) {
 	const (
 		version  = "1.0.12"
 		checksum = "G9AjnU_C160q814MCdjFOVt_mQz_pIt4wf4GNOQmGJS3UuuyMw53sfPvJ7WOqwXN"
 	)
-	return s.NewPackage(t, "libXau", version, newTar(
+	return t.NewPackage("libXau", version, newTar(
 		"https://www.x.org/releases/individual/lib/"+
 			"libXau-"+version+".tar.gz",
 		checksum,
@@ -127,12 +127,12 @@ func init() {
 	})
 }
 
-func (t Toolchain) newXCBProto(s *S) (pkg.Artifact, string) {
+func (t Toolchain) newXCBProto() (pkg.Artifact, string) {
 	const (
 		version  = "1.17.0"
 		checksum = "_NtbKaJ_iyT7XiJz25mXQ7y-niTzE8sHPvLXZPcqtNoV_-vTzqkezJ8Hp2U1enCv"
 	)
-	return s.NewPackage(t, "xcb-proto", version, newTar(
+	return t.NewPackage("xcb-proto", version, newTar(
 		"https://xcb.freedesktop.org/dist/xcb-proto-"+version+".tar.gz",
 		checksum,
 		pkg.TarGzip,
@@ -152,12 +152,12 @@ func init() {
 	})
 }
 
-func (t Toolchain) newXCB(s *S) (pkg.Artifact, string) {
+func (t Toolchain) newXCB() (pkg.Artifact, string) {
 	const (
 		version  = "1.17.0"
 		checksum = "hjjsc79LpWM_hZjNWbDDS6qRQUXREjjekS6UbUsDq-RR1_AjgNDxhRvZf-1_kzDd"
 	)
-	return s.NewPackage(t, "xcb", version, newTar(
+	return t.NewPackage("xcb", version, newTar(
 		"https://xcb.freedesktop.org/dist/libxcb-"+version+".tar.gz",
 		checksum,
 		pkg.TarGzip,
@@ -186,12 +186,12 @@ func init() {
 	})
 }
 
-func (t Toolchain) newLibxcbUtilKeysyms(s *S) (pkg.Artifact, string) {
+func (t Toolchain) newLibxcbUtilKeysyms() (pkg.Artifact, string) {
 	const (
 		version  = "0.4.1"
 		checksum = "-EEje12UEjtFBuIjb6Fy4cxEghV20BXwQ1BLvhtvSuVcrFkp_X-ZHRM48wAspXZ4"
 	)
-	return s.NewPackage(t, "libxcb-util-keysyms", version, newTar(
+	return t.NewPackage("libxcb-util-keysyms", version, newTar(
 		"https://xcb.freedesktop.org/dist/xcb-util-keysyms-"+version+".tar.gz",
 		checksum,
 		pkg.TarGzip,
@@ -217,12 +217,12 @@ func init() {
 	})
 }
 
-func (t Toolchain) newLibxcbUtilImage(s *S) (pkg.Artifact, string) {
+func (t Toolchain) newLibxcbUtilImage() (pkg.Artifact, string) {
 	const (
 		version  = "0.4.1"
 		checksum = "47pvXmFwaUBZIrJ4CE9xjTQIFyxeqoNAL-DshlB11GZ_jjI3G1a6KF0K7mtBQ1E7"
 	)
-	return s.NewPackage(t, "libxcb-util-image", version, newTar(
+	return t.NewPackage("libxcb-util-image", version, newTar(
 		"https://xcb.freedesktop.org/dist/xcb-util-image-"+version+".tar.gz",
 		checksum,
 		pkg.TarGzip,
@@ -248,12 +248,12 @@ func init() {
 	})
 }
 
-func (t Toolchain) newLibxcbUtilWM(s *S) (pkg.Artifact, string) {
+func (t Toolchain) newLibxcbUtilWM() (pkg.Artifact, string) {
 	const (
 		version  = "0.4.2"
 		checksum = "g0VZgMU9hcIgyXb3XxBR9xqsvUMBd9qt_Dbmwoj2h5y24pODr_S_D0DhRsuXUNjF"
 	)
-	return s.NewPackage(t, "libxcb-util-wm", version, newTar(
+	return t.NewPackage("libxcb-util-wm", version, newTar(
 		"https://xcb.freedesktop.org/dist/xcb-util-wm-"+version+".tar.gz",
 		checksum,
 		pkg.TarGzip,
@@ -280,12 +280,12 @@ func init() {
 	})
 }
 
-func (t Toolchain) newLibxcbUtil(s *S) (pkg.Artifact, string) {
+func (t Toolchain) newLibxcbUtil() (pkg.Artifact, string) {
 	const (
 		version  = "0.4.1"
 		checksum = "YMXGQUQbF6PoEAGflvYnJYsLWjti6sL_ifY47wIXTNGVM3tQ8u41nkBYN4K1D5CD"
 	)
-	return s.NewPackage(t, "libxcb-util", version, newTar(
+	return t.NewPackage("libxcb-util", version, newTar(
 		"https://www.x.org/releases/individual/xcb/"+
 			"xcb-util-"+version+".tar.gz",
 		checksum,
@@ -313,12 +313,12 @@ func init() {
 	})
 }
 
-func (t Toolchain) newLibxcbRenderUtil(s *S) (pkg.Artifact, string) {
+func (t Toolchain) newLibxcbRenderUtil() (pkg.Artifact, string) {
 	const (
 		version  = "0.3.10"
 		checksum = "n08L8PyCoOd7v2vb6fSVq5Pq6JtteXVh9K2wrQMTNwGMf_Fjpi6i3HWF-TMFSVTI"
 	)
-	return s.NewPackage(t, "libxcb-render-util", version, newTar(
+	return t.NewPackage("libxcb-render-util", version, newTar(
 		"https://www.x.org/releases/individual/xcb/"+
 			"xcb-util-renderutil-"+version+".tar.gz",
 		checksum,
@@ -346,12 +346,12 @@ func init() {
 	})
 }
 
-func (t Toolchain) newLibX11(s *S) (pkg.Artifact, string) {
+func (t Toolchain) newLibX11() (pkg.Artifact, string) {
 	const (
 		version  = "1.8.13"
 		checksum = "ARh-cuZY_U2v3DbPS1byc7ybh9NInZc-yav7SJiusk_C7408s058qWV83ocMd2pT"
 	)
-	return s.NewPackage(t, "libX11", version, newFromGitLab(
+	return t.NewPackage("libX11", version, newFromGitLab(
 		"gitlab.freedesktop.org",
 		"xorg/lib/libx11",
 		"libX11-"+version,
@@ -390,12 +390,12 @@ func init() {
 	})
 }
 
-func (t Toolchain) newLibXext(s *S) (pkg.Artifact, string) {
+func (t Toolchain) newLibXext() (pkg.Artifact, string) {
 	const (
 		version  = "1.3.7"
 		checksum = "-0wvUDaucLPLNOrK1pcKhHNoO-5nUqQyyw6JAbhx65gRjuMiNKKaF2_tcrbC_KNq"
 	)
-	return s.NewPackage(t, "libXext", version, newFromGitLab(
+	return t.NewPackage("libXext", version, newFromGitLab(
 		"gitlab.freedesktop.org",
 		"xorg/lib/libxext",
 		"libXext-"+version,
@@ -427,12 +427,12 @@ func init() {
 	})
 }
 
-func (t Toolchain) newLibXfixes(s *S) (pkg.Artifact, string) {
+func (t Toolchain) newLibXfixes() (pkg.Artifact, string) {
 	const (
 		version  = "6.0.2"
 		checksum = "_-kJfKZ7cE3NNeMr6NLSXCmsyP7MVEHVPLNfxatz2qBy3_fZJvPMQwZNOC9y6V5L"
 	)
-	return s.NewPackage(t, "libXfixes", version, newFromGitLab(
+	return t.NewPackage("libXfixes", version, newFromGitLab(
 		"gitlab.freedesktop.org",
 		"xorg/lib/libxfixes",
 		"libXfixes-"+version,
@@ -465,12 +465,12 @@ func init() {
 	})
 }
 
-func (t Toolchain) newLibXrender(s *S) (pkg.Artifact, string) {
+func (t Toolchain) newLibXrender() (pkg.Artifact, string) {
 	const (
 		version  = "0.9.12"
 		checksum = "s6nWn-r17X_W-7anaS7wIcq5_Levf9zAigwJDD9Klp-cCJTVDhLo7GufuVOrxVP0"
 	)
-	return s.NewPackage(t, "libXrender", version, newFromGitLab(
+	return t.NewPackage("libXrender", version, newFromGitLab(
 		"gitlab.freedesktop.org",
 		"xorg/lib/libxrender",
 		"libXrender-"+version,
@@ -502,12 +502,12 @@ func init() {
 	})
 }
 
-func (t Toolchain) newLibxshmfence(s *S) (pkg.Artifact, string) {
+func (t Toolchain) newLibxshmfence() (pkg.Artifact, string) {
 	const (
 		version  = "1.3.3"
 		checksum = "JamExTPg81By2fs3vWdeo_dzlpBQeAwXr2sDXeHJqm9XBoLW5pamiD6FgAWtAKyA"
 	)
-	return s.NewPackage(t, "libxshmfence", version, newFromGitLab(
+	return t.NewPackage("libxshmfence", version, newFromGitLab(
 		"gitlab.freedesktop.org",
 		"xorg/lib/libxshmfence",
 		"libxshmfence-"+version,
@@ -535,12 +535,12 @@ func init() {
 	})
 }
 
-func (t Toolchain) newLibXxf86vm(s *S) (pkg.Artifact, string) {
+func (t Toolchain) newLibXxf86vm() (pkg.Artifact, string) {
 	const (
 		version  = "1.1.7"
 		checksum = "mS4cgKWrwz6M1Lb6Qu4ZVh8Xn2Ca_4HXPxr3LDad4iYY1LecZfeLUPW1hkp6amX_"
 	)
-	return s.NewPackage(t, "libXxf86vm", version, newFromGitLab(
+	return t.NewPackage("libXxf86vm", version, newFromGitLab(
 		"gitlab.freedesktop.org",
 		"xorg/lib/libxxf86vm",
 		"libXxf86vm-"+version,
@@ -573,12 +573,12 @@ func init() {
 	})
 }
 
-func (t Toolchain) newLibXrandr(s *S) (pkg.Artifact, string) {
+func (t Toolchain) newLibXrandr() (pkg.Artifact, string) {
 	const (
 		version  = "1.5.5"
 		checksum = "OF7C7VC5MwnFue9UX5UnIkG1PIWvn9bBMq6d4mVyJJ_rcF0w4Kedn1lfxBsXEKAP"
 	)
-	return s.NewPackage(t, "libXrandr", version, newFromGitLab(
+	return t.NewPackage("libXrandr", version, newFromGitLab(
 		"gitlab.freedesktop.org",
 		"xorg/lib/libxrandr",
 		"libXrandr-"+version,
@@ -613,12 +613,12 @@ func init() {
 	})
 }
 
-func (t Toolchain) newFontUtil(s *S) (pkg.Artifact, string) {
+func (t Toolchain) newFontUtil() (pkg.Artifact, string) {
 	const (
 		version  = "1.4.2"
 		checksum = "YWiaIxkq-N2yNdbGa_RF1S0UkQq6xsgoRT73WZP2DOmyH_CJ0TAkpQjId657MQmh"
 	)
-	return s.NewPackage(t, "font-util", version, newFromGitLab(
+	return t.NewPackage("font-util", version, newFromGitLab(
 		"gitlab.freedesktop.org",
 		"xorg/font/util",
 		"font-util-"+version,
@@ -645,12 +645,12 @@ func init() {
 	})
 }
 
-func (t Toolchain) newLibfontenc(s *S) (pkg.Artifact, string) {
+func (t Toolchain) newLibfontenc() (pkg.Artifact, string) {
 	const (
 		version  = "1.1.9"
 		checksum = "XqosXfbVwaoYzG9vVyRCl3eatwjASoJdLZsxQ37NN8S_jTyqNmbxpRSJGImJj7RS"
 	)
-	return s.NewPackage(t, "libfontenc", version, newFromGitLab(
+	return t.NewPackage("libfontenc", version, newFromGitLab(
 		"gitlab.freedesktop.org",
 		"xorg/lib/libfontenc",
 		"libfontenc-"+version,
@@ -679,12 +679,12 @@ func init() {
 	})
 }
 
-func (t Toolchain) newLibxkbfile(s *S) (pkg.Artifact, string) {
+func (t Toolchain) newLibxkbfile() (pkg.Artifact, string) {
 	const (
 		version  = "1.2.0"
 		checksum = "WUtph1ab0AyATahlwljchBxZJcpjYrjyhCK9DW2VO0uXEXaN22GWmUaibcA83i_B"
 	)
-	return s.NewPackage(t, "libxkbfile", version, newFromGitLab(
+	return t.NewPackage("libxkbfile", version, newFromGitLab(
 		"gitlab.freedesktop.org",
 		"xorg/lib/libxkbfile",
 		"libxkbfile-"+version,
@@ -709,12 +709,12 @@ func init() {
 	})
 }
 
-func (t Toolchain) newXkbcomp(s *S) (pkg.Artifact, string) {
+func (t Toolchain) newXkbcomp() (pkg.Artifact, string) {
 	const (
 		version  = "1.5.0"
 		checksum = "ttICW8ZPbljI-nw2kknvxFhwFoDK40iAMBeZDLAHYsHf3B6UPO_zc9TpzZYRRyZH"
 	)
-	return s.NewPackage(t, "xkbcomp", version, newFromGitLab(
+	return t.NewPackage("xkbcomp", version, newFromGitLab(
 		"gitlab.freedesktop.org",
 		"xorg/app/xkbcomp",
 		"xkbcomp-"+version,
@@ -747,12 +747,12 @@ func init() {
 	})
 }
 
-func (t Toolchain) newLibXfont2(s *S) (pkg.Artifact, string) {
+func (t Toolchain) newLibXfont2() (pkg.Artifact, string) {
 	const (
 		version  = "2.0.7"
 		checksum = "jv9BZNA02493KB8j1lfAErF5SA3ZFcAhm3_UVJ--Bp1maz-vNprl_wXpkHApBi9M"
 	)
-	return s.NewPackage(t, "libXfont2", version, newFromGitLab(
+	return t.NewPackage("libXfont2", version, newFromGitLab(
 		"gitlab.freedesktop.org",
 		"xorg/lib/libxfont",
 		"libXfont2-"+version,
@@ -788,12 +788,12 @@ func init() {
 	})
 }
 
-func (t Toolchain) newLibxcvt(s *S) (pkg.Artifact, string) {
+func (t Toolchain) newLibxcvt() (pkg.Artifact, string) {
 	const (
 		version  = "0.1.3"
 		checksum = "IfIA7SxlHMWh681e1AgYmZcRAfkZd5LlzmqcMRifNY5nNVRrUx_wnoaidAv0Yu03"
 	)
-	return s.NewPackage(t, "libxcvt", version, newFromGitLab(
+	return t.NewPackage("libxcvt", version, newFromGitLab(
 		"gitlab.freedesktop.org",
 		"xorg/lib/libxcvt",
 		"libxcvt-"+version,
@@ -812,12 +812,12 @@ func init() {
 	})
 }
 
-func (t Toolchain) newLibXdmcp(s *S) (pkg.Artifact, string) {
+func (t Toolchain) newLibXdmcp() (pkg.Artifact, string) {
 	const (
 		version  = "1.1.5"
 		checksum = "N6AJSv9pmeBedFn8KuSIOUGvTken4rkypNWVE2KfPlliwkfIbhfXrt5YHZkBMUHp"
 	)
-	return s.NewPackage(t, "libXdmcp", version, newFromGitLab(
+	return t.NewPackage("libXdmcp", version, newFromGitLab(
 		"gitlab.freedesktop.org",
 		"xorg/lib/libxdmcp",
 		"libXdmcp-"+version,
@@ -845,12 +845,12 @@ func init() {
 	})
 }
 
-func (t Toolchain) newXkeyboardConfig(s *S) (pkg.Artifact, string) {
+func (t Toolchain) newXkeyboardConfig() (pkg.Artifact, string) {
 	const (
 		version  = "2.47"
 		checksum = "E03PsPIaRrxPAuKgDGSQyPiJB49wXtyyvdV0lVx3_G-pelMMlaFLkoTDHTHG_qgA"
 	)
-	return s.NewPackage(t, "xkeyboard-config", version, newFromGitLab(
+	return t.NewPackage("xkeyboard-config", version, newFromGitLab(
 		"gitlab.freedesktop.org",
 		"xkeyboard-config/xkeyboard-config",
 		"xkeyboard-config-"+version,
@@ -871,12 +871,12 @@ func init() {
 	})
 }
 
-func (t Toolchain) newLibpciaccess(s *S) (pkg.Artifact, string) {
+func (t Toolchain) newLibpciaccess() (pkg.Artifact, string) {
 	const (
 		version  = "0.19"
 		checksum = "84H0c_U_7fMqo81bpuwyXGXtk4XvvFH_YK00UiOriv3YGsuAhmbo2IkFhmJnvu2x"
 	)
-	return s.NewPackage(t, "libpciaccess", version, newFromGitLab(
+	return t.NewPackage("libpciaccess", version, newFromGitLab(
 		"gitlab.freedesktop.org",
 		"xorg/lib/libpciaccess",
 		"libpciaccess-"+version,
@@ -903,12 +903,12 @@ func init() {
 	})
 }
 
-func (t Toolchain) newXserver(s *S) (pkg.Artifact, string) {
+func (t Toolchain) newXserver() (pkg.Artifact, string) {
 	const (
 		version  = "21.1.22"
 		checksum = "prLT2wKecBu5m9w1ThgIt0GvenNpjKXoOyvTiMA1oQTlP0QHh6QiWsdvH3OmUwNo"
 	)
-	return s.NewPackage(t, "xserver", version, newFromGitLab(
+	return t.NewPackage("xserver", version, newFromGitLab(
 		"gitlab.freedesktop.org",
 		"xorg/xserver",
 		"xorg-server-"+version,