Skip to content

elvish: Fix crash on go 1.17 #11983

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
herbygillot merged 1 commit into from
Aug 25, 2021
Merged

elvish: Fix crash on go 1.17 #11983

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 11 additions & 6 deletions shells/elvish/Portfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ PortGroup golang 1.0

go.setup github.com/elves/elvish 0.16.1 v
go.package src.elv.sh
revision 0
revision 1

homepage https://elv.sh

Expand Down Expand Up @@ -34,7 +34,12 @@ variant plugin_support description {Enable experimental plugin support} {
build.args-append ELVISH_PLUGIN_SUPPORT=1
}

patch {
# Remove patch when this PR has been merge:
# https://github.com/elves/elvish/pull/1390
patchfiles patch-backport-x-sys.diff
patch.pre_args -p1

post-patch {
# The Makefile tries to call `git rev-parse` to determine the
# VersionSuffix. Since this is not a checked-out git repository, doing
# that will fail. Patch the Makefile to manually set the VersionSuffix:
Expand All @@ -55,10 +60,10 @@ checksums ${distname}${extract.suffix} \
size 664779

go.vendors golang.org/x/sys \
lock c12d262b63d8 \
rmd160 e96b9a22d4a7519872a78461337d9b9602b14f51 \
sha256 3432e1055b4990dc198ae92a1ad0676cf577c786d45897609949b58fbec74093 \
size 1060953 \
lock 41cdb8703e55 \
rmd160 1b61146b9b05b2065b2e3faf7267b938f220f11b \
sha256 8c7729f6f4c4e0649a75eb973d95c8e5ac3bf5df5660ecfe14d8b49e0d8a46ce \
size 1210583 \
go.etcd.io/bbolt \
repo github.com/etcd-io/bbolt \
lock v1.3.5 \
Expand Down
38 changes: 38 additions & 0 deletions shells/elvish/files/patch-backport-x-sys.diff
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
From aae0174d59f1bb7c54168fc57f71d4c2b8721838 Mon Sep 17 00:00:00 2001
From: Stefan Baebler <stefan.baebler@gmail.com>
Date: Wed, 25 Aug 2021 11:42:38 +0200
Subject: [PATCH] Backport x/sys upgrade to 0.16 release

Backport just x/sys upgrade from c99d6e1c9587d683c8a262925255d8609a9843d8 to v0.16-release branch

Alternative to & closes #1388
---
go.mod | 2 +-
go.sum | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/go.mod b/go.mod
index ef103663..b2693d63 100644
--- a/go.mod
+++ b/go.mod
@@ -4,7 +4,7 @@ require (
github.com/creack/pty v1.1.11
github.com/mattn/go-isatty v0.0.12
go.etcd.io/bbolt v1.3.5
- golang.org/x/sys v0.0.0-20200824131525-c12d262b63d8
+ golang.org/x/sys v0.0.0-20210820121016-41cdb8703e55
)

go 1.15
diff --git a/go.sum b/go.sum
index a21fa497..d8a7498d 100644
--- a/go.sum
+++ b/go.sum
@@ -6,5 +6,5 @@ go.etcd.io/bbolt v1.3.5 h1:XAzx9gjCb0Rxj7EoqcClPD1d5ZBxZJk0jbuoPHenBt0=
go.etcd.io/bbolt v1.3.5/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ=
golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200824131525-c12d262b63d8 h1:AvbQYmiaaaza3cW3QXRyPo5kYgpFIzOAfeAAN7m3qQ4=
-golang.org/x/sys v0.0.0-20200824131525-c12d262b63d8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210820121016-41cdb8703e55 h1:rw6UNGRMfarCepjI8qOepea/SXwIBVfTKjztZ5gBbq4=
+golang.org/x/sys v0.0.0-20210820121016-41cdb8703e55/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=