diff --git a/pkgs/by-name/go/go-licenses/fix-go-version-error.patch b/pkgs/by-name/go/go-licenses/fix-go-version-error.patch deleted file mode 100644 index 1e102636dd45..000000000000 --- a/pkgs/by-name/go/go-licenses/fix-go-version-error.patch +++ /dev/null @@ -1,65 +0,0 @@ -diff --git a/go.mod b/go.mod -index 7e3d596..d90b393 100644 ---- a/go.mod -+++ b/go.mod -@@ -1,27 +1,50 @@ - module github.com/google/go-licenses - --go 1.16 -+go 1.17 - - require ( -- cloud.google.com/go/iam v0.4.0 // indirect -- github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect - github.com/google/go-cmp v0.5.8 - github.com/google/go-replayers/httpreplay v1.1.1 - github.com/google/licenseclassifier v0.0.0-20210722185704-3043a050f148 -- github.com/kr/text v0.2.0 // indirect -- github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect - github.com/otiai10/copy v1.6.0 -- github.com/pkg/errors v0.9.1 // indirect -- github.com/sergi/go-diff v1.2.0 // indirect - github.com/spf13/cobra v1.6.0 -- github.com/stretchr/testify v1.8.0 // indirect - go.opencensus.io v0.23.0 -- golang.org/x/crypto v0.1.0 // indirect - golang.org/x/mod v0.7.0 - golang.org/x/net v0.5.0 - golang.org/x/text v0.6.0 - golang.org/x/tools v0.5.0 -- gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f // indirect - gopkg.in/src-d/go-git.v4 v4.13.1 - k8s.io/klog/v2 v2.80.1 - ) -+ -+require ( -+ cloud.google.com/go v0.102.1 // indirect -+ cloud.google.com/go/iam v0.4.0 // indirect -+ cloud.google.com/go/storage v1.22.1 // indirect -+ github.com/emirpasic/gods v1.12.0 // indirect -+ github.com/go-logr/logr v1.2.0 // indirect -+ github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect -+ github.com/google/martian/v3 v3.3.2 // indirect -+ github.com/inconshreveable/mousetrap v1.0.1 // indirect -+ github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect -+ github.com/kevinburke/ssh_config v0.0.0-20190725054713-01f96b0aa0cd // indirect -+ github.com/kr/text v0.2.0 // indirect -+ github.com/mitchellh/go-homedir v1.1.0 // indirect -+ github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect -+ github.com/pkg/errors v0.9.1 // indirect -+ github.com/sergi/go-diff v1.2.0 // indirect -+ github.com/spf13/pflag v1.0.5 // indirect -+ github.com/src-d/gcfg v1.4.0 // indirect -+ github.com/stretchr/testify v1.8.0 // indirect -+ github.com/xanzy/ssh-agent v0.2.1 // indirect -+ golang.org/x/crypto v0.1.0 // indirect -+ golang.org/x/oauth2 v0.0.0-20220622183110-fd043fe589d2 // indirect -+ golang.org/x/sys v0.4.0 // indirect -+ google.golang.org/api v0.93.0 // indirect -+ google.golang.org/genproto v0.0.0-20220815135757-37a418bb8959 // indirect -+ google.golang.org/grpc v1.48.0 // indirect -+ google.golang.org/protobuf v1.28.1 // indirect -+ gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f // indirect -+ gopkg.in/src-d/go-billy.v4 v4.3.2 // indirect -+ gopkg.in/warnings.v0 v0.1.2 // indirect -+) diff --git a/pkgs/by-name/go/go-licenses/package.nix b/pkgs/by-name/go/go-licenses/package.nix index 5da667c7f0bd..bab6b8313b4c 100644 --- a/pkgs/by-name/go/go-licenses/package.nix +++ b/pkgs/by-name/go/go-licenses/package.nix @@ -10,23 +10,16 @@ buildGoModule (finalAttrs: { pname = "go-licenses"; - version = "1.6.0"; + version = "2.0.1"; src = fetchFromGitHub { owner = "google"; repo = "go-licenses"; tag = "v${finalAttrs.version}"; - hash = "sha256-GAlwTVoVA+n9+EfhybmpKm16FoY9kFzrxy1ZQxS6A8E="; + hash = "sha256-byKuUf8XMyXjAHZUANaBVAc6c2Jz9mEEdRxAy69P2QM="; }; - vendorHash = "sha256-ToRn2wj7Yi+UDJwvAhV0ACEhqlcQjt4bRpz7abNRt9A="; - - patches = [ - # Without this, we get error messages like: - # vendor/golang.org/x/sys/unix/syscall.go:83:16: unsafe.Slice requires go1.17 or later (-lang was set to go1.16; check go.mod) - # The patch was generated by changing "go 1.16" to "go 1.17" and executing `go mod tidy`. - ./fix-go-version-error.patch - ]; + vendorHash = "sha256-AYbx/DmYnbjJ2iqx34t/dUsthTjJ+YDvfxxCl/cJenI="; nativeBuildInputs = [ installShellFiles