forked from mirrors/nixpkgs
gsctl: unpin go
This commit is contained in:
parent
70a41e04e4
commit
819f41abef
|
@ -13,6 +13,15 @@ buildGoModule rec {
|
|||
|
||||
vendorHash = "sha256-6b4H8YAY8d/qIGnnGPYZoXne1LXHLsc0OEq0lCeqivo=";
|
||||
|
||||
patches = [
|
||||
./go120-compatibility.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# fails on sandbox
|
||||
rm commands/root_test.go
|
||||
'';
|
||||
|
||||
ldflags = [
|
||||
"-s" "-w"
|
||||
"-X github.com/giantswarm/gsctl/buildinfo.Version=${version}"
|
||||
|
|
21
pkgs/applications/misc/gsctl/go120-compatibility.patch
Normal file
21
pkgs/applications/misc/gsctl/go120-compatibility.patch
Normal file
|
@ -0,0 +1,21 @@
|
|||
--- a/client/clienterror/matcher.go
|
||||
+++ b/client/clienterror/matcher.go
|
||||
@@ -2,6 +2,7 @@ package clienterror
|
||||
|
||||
import (
|
||||
"crypto/x509"
|
||||
+ "errors"
|
||||
"net/http"
|
||||
|
||||
"github.com/giantswarm/microerror"
|
||||
@@ -101,9 +102,7 @@ func IsServiceUnavailableError(err error) bool {
|
||||
// a x509.UnknownAuthorityError
|
||||
func IsCertificateSignedByUnknownAuthorityError(err error) bool {
|
||||
if clientErr, ok := err.(*APIError); ok {
|
||||
- if _, certErrorOK := clientErr.OriginalError.(x509.UnknownAuthorityError); certErrorOK {
|
||||
- return true
|
||||
- }
|
||||
+ return errors.As(clientErr.OriginalError, &x509.UnknownAuthorityError{})
|
||||
}
|
||||
|
||||
return false
|
|
@ -5623,9 +5623,7 @@ with pkgs;
|
|||
|
||||
gscan2pdf = callPackage ../applications/graphics/gscan2pdf { };
|
||||
|
||||
gsctl = callPackage ../applications/misc/gsctl {
|
||||
buildGoModule = buildGo119Module; # go 1.20 build failure
|
||||
};
|
||||
gsctl = callPackage ../applications/misc/gsctl { };
|
||||
|
||||
gsocket = callPackage ../tools/networking/gsocket { };
|
||||
|
||||
|
|
Loading…
Reference in a new issue