status-im
/
status-mobile
mirror of https://github.com/status-im/status-mobile.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

upgrade go to 1.21 (#20157)

This commit is contained in:
Siddarth Kumar 2024-05-30 14:41:56 +05:30 committed by GitHub
parent 841a6140e3
commit 5559599381
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nix/overlay.nix
View File

@ -59,10 +59,10 @@ in {
xcodeWrapper = callPackage ./pkgs/xcodeenv/compose-xcodewrapper.nix { } { xcodeWrapper = callPackage ./pkgs/xcodeenv/compose-xcodewrapper.nix { } {
versions = ["15.1" "15.2" "15.3"]; versions = ["15.1" "15.2" "15.3"];
}; };
go = super.go_1_20; go = super.go_1_21;
clang = super.clang_15; clang = super.clang_15;
buildGoPackage = super.buildGo120Package; buildGoPackage = super.buildGo121Package;
buildGoModule = super.buildGo120Module; buildGoModule = super.buildGo121Module;
gomobile = (super.gomobile.overrideAttrs (old: { gomobile = (super.gomobile.overrideAttrs (old: {
patches = [ patches = [
(self.fetchurl { # https://github.com/golang/mobile/pull/84 (self.fetchurl { # https://github.com/golang/mobile/pull/84

4
nix/status-go/library/default.nix
View File

@ -15,6 +15,10 @@ buildGoPackage {
# TODO: try removing when go is upgraded to 1.22 # TODO: try removing when go is upgraded to 1.22
GODEBUG = "netdns=cgo+2"; GODEBUG = "netdns=cgo+2";
# Since go 1.21 status-go compiled library includes references to cgo runtime.
# FIXME: Remove this when go 1.23 or later versions fix this madness.
allowGoReference = true;
preBuild = '' preBuild = ''
pushd go/src/$goPackagePath pushd go/src/$goPackagePath
go run cmd/library/*.go > $NIX_BUILD_TOP/main.go go run cmd/library/*.go > $NIX_BUILD_TOP/main.go

6
status-go-version.json
View File

@ -3,7 +3,7 @@
"_comment": "Instead use: scripts/update-status-go.sh <rev>", "_comment": "Instead use: scripts/update-status-go.sh <rev>",
"owner": "status-im", "owner": "status-im",
"repo": "status-go", "repo": "status-go",
"version": "v0.179.23", "version": "v0.179.24",
"commit-sha1": "edc65e461157bb0e9ec1a24eca4f53c44d0a717f", "commit-sha1": "701b27632438a8328506cba23943bbdeb8b15b0c",
"src-sha256": "1xa8hpn9q3ry1f5ysnjl2nc2jvfhc3n9bpdvzpfxx7s4lghm1ksf" "src-sha256": "1jp3r6pb3q3jzjdlx8yl4js63q4av36n0wx9akb0pnarm7mwpfpb"
} }