diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2017-08-13 09:50:47 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2017-08-13 09:50:47 +0200 |
| commit | 2a8cd14d5f6e6df9c0dc466ff11844329fc3b6b2 (patch) | |
| tree | 689709d364ea0b98f8b1119acaff9ab84be6eebf /pkgs/development/compilers | |
| parent | 60730cb04351a4ab3ecde1d36b2d441762defb6e (diff) | |
| parent | ef026e02fcaa92323be875d8c7146b0b86e31880 (diff) | |
| download | nixpkgs-2a8cd14d5f6e6df9c0dc466ff11844329fc3b6b2.tar nixpkgs-2a8cd14d5f6e6df9c0dc466ff11844329fc3b6b2.tar.gz nixpkgs-2a8cd14d5f6e6df9c0dc466ff11844329fc3b6b2.tar.bz2 nixpkgs-2a8cd14d5f6e6df9c0dc466ff11844329fc3b6b2.tar.lz nixpkgs-2a8cd14d5f6e6df9c0dc466ff11844329fc3b6b2.tar.xz nixpkgs-2a8cd14d5f6e6df9c0dc466ff11844329fc3b6b2.tar.zst nixpkgs-2a8cd14d5f6e6df9c0dc466ff11844329fc3b6b2.zip | |
Merge remote-tracking branch 'upstream/master' into HEAD
Diffstat (limited to 'pkgs/development/compilers')
| -rw-r--r-- | pkgs/development/compilers/go/1.6.nix | 1 | ||||
| -rw-r--r-- | pkgs/development/compilers/go/1.7.nix | 1 | ||||
| -rw-r--r-- | pkgs/development/compilers/go/1.8.nix | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/pkgs/development/compilers/go/1.6.nix b/pkgs/development/compilers/go/1.6.nix index 61408c0ebb3..0eebc92ee59 100644 --- a/pkgs/development/compilers/go/1.6.nix +++ b/pkgs/development/compilers/go/1.6.nix @@ -128,6 +128,7 @@ stdenv.mkDerivation rec { else if stdenv.system == "i686-linux" then "386" else if stdenv.system == "x86_64-linux" then "amd64" else if stdenv.isArm then "arm" + else if stdenv.isAarch64 then "arm64" else throw "Unsupported system"; GOARM = stdenv.lib.optionalString (stdenv.system == "armv5tel-linux") "5"; GO386 = 387; # from Arch: don't assume sse2 on i686 diff --git a/pkgs/development/compilers/go/1.7.nix b/pkgs/development/compilers/go/1.7.nix index d7a824239b8..b1230da5a14 100644 --- a/pkgs/development/compilers/go/1.7.nix +++ b/pkgs/development/compilers/go/1.7.nix @@ -123,6 +123,7 @@ stdenv.mkDerivation rec { else if stdenv.system == "i686-linux" then "386" else if stdenv.system == "x86_64-linux" then "amd64" else if stdenv.isArm then "arm" + else if stdenv.isAarch64 then "arm64" else throw "Unsupported system"; GOARM = optionalString (stdenv.system == "armv5tel-linux") "5"; GO386 = 387; # from Arch: don't assume sse2 on i686 diff --git a/pkgs/development/compilers/go/1.8.nix b/pkgs/development/compilers/go/1.8.nix index 8e0b1c7360f..8a675b1b776 100644 --- a/pkgs/development/compilers/go/1.8.nix +++ b/pkgs/development/compilers/go/1.8.nix @@ -128,6 +128,7 @@ stdenv.mkDerivation rec { else if stdenv.system == "i686-linux" then "386" else if stdenv.system == "x86_64-linux" then "amd64" else if stdenv.isArm then "arm" + else if stdenv.isAarch64 then "arm64" else throw "Unsupported system"; GOARM = optionalString (stdenv.system == "armv5tel-linux") "5"; GO386 = 387; # from Arch: don't assume sse2 on i686 |