internal/rosa: key metadata by string

For upcoming azalea integration. The API is quite ugly right now to ease migration.

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

1 files changed, 16 insertions, 16 deletions

diff --git a/internal/rosa/mesa.go b/internal/rosa/mesa.go
index b5780acb..d1037656 100644
--- a/internal/rosa/mesa.go
+++ b/internal/rosa/mesa.go
@@ -6,12 +6,12 @@ import (
 	"hakurei.app/internal/pkg"
 )
 
-func (t Toolchain) newLibglvnd() (pkg.Artifact, string) {
+func (t Toolchain) newLibglvnd(s *S) (pkg.Artifact, string) {
 	const (
 		version  = "1.7.0"
 		checksum = "eIQJK2sgFQDHdeFkQO87TrSUaZRFG4y2DrwA8Ut-sGboI59uw1OOiIVqq2AIwnGY"
 	)
-	return t.NewPackage("libglvnd", version, newFromGitLab(
+	return s.NewPackage(t, "libglvnd", version, newFromGitLab(
 		"gitlab.freedesktop.org",
 		"glvnd/libglvnd",
 		"v"+version,
@@ -35,7 +35,7 @@ trap 'kill $XVFB_PID && wait $XVFB_PID' EXIT
 	), version
 }
 func init() {
-	artifactsM[Libglvnd] = Metadata{
+	native.MustRegister(&Artifact{
 		f: Toolchain.newLibglvnd,
 
 		Name:        "libglvnd",
@@ -47,15 +47,15 @@ func init() {
 		},
 
 		ID: 12098,
-	}
+	})
 }
 
-func (t Toolchain) newLibdrm() (pkg.Artifact, string) {
+func (t Toolchain) newLibdrm(s *S) (pkg.Artifact, string) {
 	const (
 		version  = "2.4.133"
 		checksum = "bfj296NcR9DndO11hqDbSRFPqaweSLMqRk3dlCPZpM6FONX1WZ9J4JdbTDMUd1rU"
 	)
-	return t.NewPackage("libdrm", version, newFromGitLab(
+	return s.NewPackage(t, "libdrm", version, newFromGitLab(
 		"gitlab.freedesktop.org",
 		"mesa/libdrm",
 		"libdrm-"+version,
@@ -72,7 +72,7 @@ func (t Toolchain) newLibdrm() (pkg.Artifact, string) {
 	), version
 }
 func init() {
-	artifactsM[Libdrm] = Metadata{
+	native.MustRegister(&Artifact{
 		f: Toolchain.newLibdrm,
 
 		Name:        "libdrm",
@@ -84,15 +84,15 @@ func init() {
 		},
 
 		ID: 1596,
-	}
+	})
 }
 
-func (t Toolchain) newLibva() (pkg.Artifact, string) {
+func (t Toolchain) newLibva(s *S) (pkg.Artifact, string) {
 	const (
 		version  = "2.23.0"
 		checksum = "UmF5tPyWIG_w5kiR3KFpoYbF7UUcaak5tyc-RhOheNTwQlLkPlifreFYCM9FQxbq"
 	)
-	return t.NewPackage("libva", version, newFromGitHub(
+	return s.NewPackage(t, "libva", version, newFromGitHub(
 		"intel/libva",
 		version,
 		checksum,
@@ -111,7 +111,7 @@ func (t Toolchain) newLibva() (pkg.Artifact, string) {
 	), version
 }
 func init() {
-	artifactsM[Libva] = Metadata{
+	native.MustRegister(&Artifact{
 		f: Toolchain.newLibva,
 
 		Name:        "libva",
@@ -126,15 +126,15 @@ func init() {
 		},
 
 		ID: 1752,
-	}
+	})
 }
 
-func (t Toolchain) newMesa() (pkg.Artifact, string) {
+func (t Toolchain) newMesa(s *S) (pkg.Artifact, string) {
 	const (
 		version  = "26.1.0"
 		checksum = "zU0fjqevySBaoi_5SLW3e2UffmGeBdxOuHmAHTH68n2hV-sjYoqg30koLqFXuk5y"
 	)
-	return t.NewPackage("mesa", version, newFromGitLab(
+	return s.NewPackage(t, "mesa", version, newFromGitLab(
 		"gitlab.freedesktop.org",
 		"mesa/mesa",
 		"mesa-"+version,
@@ -238,7 +238,7 @@ func (t Toolchain) newMesa() (pkg.Artifact, string) {
 	), version
 }
 func init() {
-	artifactsM[Mesa] = Metadata{
+	native.MustRegister(&Artifact{
 		f: Toolchain.newMesa,
 
 		Name:        "mesa",
@@ -261,5 +261,5 @@ func init() {
 		ID: 1970,
 
 		latest: (*Versions).getStable,
-	}
+	})
 }