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

upgrade Go: 1.11 > 1.12 

Signed-off-by: Jakub Sokołowski <jakub@status.im>
This commit is contained in:
Jakub Sokołowski 2019-09-27 16:21:29 +02:00
parent 6a732570c7
commit 70c6265230
No known key found for this signature in database
GPG Key ID: 4EF064D0E6D63020
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nix/derivation.nix
View File

@ -17,7 +17,7 @@ let
# TODO: Try to use stdenv for iOS. The problem is with building iOS as the build is trying to pass parameters to Apple's ld that are meant for GNU's ld (e.g. -dynamiclib) # TODO: Try to use stdenv for iOS. The problem is with building iOS as the build is trying to pass parameters to Apple's ld that are meant for GNU's ld (e.g. -dynamiclib)
stdenv = pkgs.stdenvNoCC; stdenv = pkgs.stdenvNoCC;
maven = pkgs.maven; maven = pkgs.maven;
baseGo = pkgs.go_1_11; baseGo = pkgs.go_1_12;
go = pkgs.callPackage ./patched-go { inherit baseGo; }; go = pkgs.callPackage ./patched-go { inherit baseGo; };
buildGoPackage = pkgs.buildGoPackage.override { inherit go; }; buildGoPackage = pkgs.buildGoPackage.override { inherit go; };
desktop = pkgs.callPackage ./desktop { inherit target-os stdenv status-go pkgs go nodejs; inherit (pkgs) darwin; }; desktop = pkgs.callPackage ./desktop { inherit target-os stdenv status-go pkgs go nodejs; inherit (pkgs) darwin; };

9
nix/nixpkgs-bootstrap.nix
View File

@ -1,11 +1,14 @@
# This file controls the pinned version of nixpkgs we use for our Nix environment # This file controls the pinned version of nixpkgs we use for our Nix environment
{ config ? { android_sdk.accept_license = true; }, { config ? { android_sdk.accept_license = true; },
pkgs ? (import ((import <nixpkgs> { }).fetchFromGitHub { pkgs ? (import ((import <nixpkgs> { }).fetchFromGitHub {
name = "nixpkgs-source";
owner = "status-im"; owner = "status-im";
repo = "nixpkgs"; repo = "nixpkgs";
rev = "db492b61572251c2866f6b5e6e94e9d70e7d3021"; rev = "f54e1c6441868450e947f6171b129dfb90a91653";
sha256 = "188r7gbcrxi20nj6xh9bmdf3lbjwb94v9s0wpacl7q39g1fca66h"; sha256 = "13cf3pi277ifg57l11kmjk08vrpv6km2jfxq7sp63zxw5bgkiqpd";
name = "nixpkgs-source"; # To get the compressed Nix sha256, use:
# nix-prefetch-url --unpack https://github.com/${ORG}/nixpkgs/archive/${REV}.tar.gz
# The last line will be the hash.
})) { inherit config; } }: })) { inherit config; } }:
{ {

2
nix/patched-go/default.nix
View File

@ -15,8 +15,6 @@ let
if tmp == "" { if tmp == "" {
tmp, err = ioutil.TempDir(os.Getenv("GOTMPDIR"), "go-build") tmp, err = ioutil.TempDir(os.Getenv("GOTMPDIR"), "go-build")
}' }'
# Disable chown tests, they fail with 'invalid argument'
rm src/os/os_unix_test.go
''; '';
}); });