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, 9 insertions, 9 deletions

diff --git a/internal/rosa/nss.go b/internal/rosa/nss.go
index db11069c..090554b5 100644
--- a/internal/rosa/nss.go
+++ b/internal/rosa/nss.go
@@ -6,7 +6,7 @@ import (
 	"hakurei.app/internal/pkg"
 )
 
-func (t Toolchain) newNSS() (pkg.Artifact, string) {
+func (t Toolchain) newNSS(s *S) (pkg.Artifact, string) {
 	const (
 		version  = "3.123.1"
 		checksum = "g811Z_fc74ssg-s6BeXRG-ipSfJggD6hrxjVJxrOBIz98CE7piv0OLwzIRLMQpwR"
@@ -14,7 +14,7 @@ func (t Toolchain) newNSS() (pkg.Artifact, string) {
 		version0  = "4_38_2"
 		checksum0 = "25x2uJeQnOHIiq_zj17b4sYqKgeoU8-IsySUptoPcdHZ52PohFZfGuIisBreWzx0"
 	)
-	return t.NewPackage("nss", version, newFromGitHub(
+	return s.NewPackage(t, "nss", version, newFromGitHub(
 		"nss-dev/nss",
 		"NSS_"+strings.Join(strings.SplitN(version, ".", 3), "_")+"_RTM",
 		checksum,
@@ -67,7 +67,7 @@ cp -r \
 	), version
 }
 func init() {
-	artifactsM[NSS] = Metadata{
+	native.MustRegister(&Artifact{
 		f: Toolchain.newNSS,
 
 		Name:        "nss",
@@ -79,7 +79,7 @@ func init() {
 		},
 
 		ID: 2503,
-	}
+	})
 }
 
 func init() {
@@ -87,7 +87,7 @@ func init() {
 		version  = "0.5.1"
 		checksum = "oxjnuIrPVMPvD6x8VFLqB7EdbfuhouGQdtPuHDpEHGzoyH5nkxqtYN9UthMY9noA"
 	)
-	artifactsM[buildcatrust] = newPythonPackage(
+	native.newPythonPackage(
 		"buildcatrust", 233988,
 		"transform certificate stores between formats",
 		"https://github.com/nix-community/buildcatrust",
@@ -102,8 +102,8 @@ rm buildcatrust/tests/test_nonhermetic.py
 	)
 }
 
-func (t Toolchain) newNSSCACert() (pkg.Artifact, string) {
-	return t.New("nss-cacert", 0, t.AppendPresets(nil,
+func (t Toolchain) newNSSCACert(s *S) (pkg.Artifact, string) {
+	return s.New(t, "nss-cacert", 0, s.AppendPresets(t, nil,
 		Bash,
 
 		NSS,
@@ -120,11 +120,11 @@ buildcatrust \
 `), Unversioned
 }
 func init() {
-	artifactsM[NSSCACert] = Metadata{
+	native.MustRegister(&Artifact{
 		f: Toolchain.newNSSCACert,
 
 		Name:        "nss-cacert",
 		Description: "bundle of X.509 certificates of public Certificate Authorities",
 		Website:     "https://curl.se/docs/caextract.html",
-	}
+	})
 }