forked from rosa/hakurei
internal/rosa: pass stage alongside state
This cleans up many function signatures. Signed-off-by: Ophestra <cat@gensokyo.uk>
This commit is contained in:
@@ -6,7 +6,7 @@ import (
|
||||
"hakurei.app/internal/pkg"
|
||||
)
|
||||
|
||||
func (t Toolchain) newNSS(s *S) (pkg.Artifact, string) {
|
||||
func (t Toolchain) newNSS() (pkg.Artifact, string) {
|
||||
const (
|
||||
version = "3.123.1"
|
||||
checksum = "g811Z_fc74ssg-s6BeXRG-ipSfJggD6hrxjVJxrOBIz98CE7piv0OLwzIRLMQpwR"
|
||||
@@ -14,7 +14,7 @@ func (t Toolchain) newNSS(s *S) (pkg.Artifact, string) {
|
||||
version0 = "4_38_2"
|
||||
checksum0 = "25x2uJeQnOHIiq_zj17b4sYqKgeoU8-IsySUptoPcdHZ52PohFZfGuIisBreWzx0"
|
||||
)
|
||||
return s.NewPackage(t, "nss", version, newFromGitHub(
|
||||
return t.NewPackage("nss", version, newFromGitHub(
|
||||
"nss-dev/nss",
|
||||
"NSS_"+strings.Join(strings.SplitN(version, ".", 3), "_")+"_RTM",
|
||||
checksum,
|
||||
@@ -102,8 +102,8 @@ rm buildcatrust/tests/test_nonhermetic.py
|
||||
)
|
||||
}
|
||||
|
||||
func (t Toolchain) newNSSCACert(s *S) (pkg.Artifact, string) {
|
||||
return s.New(t, "nss-cacert", 0, s.AppendPresets(t, nil,
|
||||
func (t Toolchain) newNSSCACert() (pkg.Artifact, string) {
|
||||
return t.New("nss-cacert", 0, t.Append(nil,
|
||||
Bash,
|
||||
|
||||
NSS,
|
||||
|
||||
Reference in New Issue
Block a user