ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-27 13:57:10 +03:00
Code Issues Projects Releases Wiki Activity

go: Update to version 1.4.1.

Browse Source 
Also had to fix the code that was trying to make sure the go-* folders get renamed to just "go".

Resolves #5797
This commit is contained in:
Brendan Long 2015-01-15 17:34:59 -06:00 committed by Charles Strahan
parent b6f9975b6a
commit 51902ba32d
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/development/compilers/go/1.4.nix
View File

@ -6,8 +6,8 @@ let
loaderArm = "${glibc}/lib/ld-linux.so.3"; loaderArm = "${glibc}/lib/ld-linux.so.3";
srcs = { srcs = {
golang = fetchurl { golang = fetchurl {
url = https://storage.googleapis.com/golang/go1.4.src.tar.gz; url = https://github.com/golang/go/archive/go1.4.1.tar.gz;
sha1 = "6a7d9bd90550ae1e164d7803b3e945dc8309252b"; sha256 = "1q21i08nymy30vszbcah8l8yjxm32x2wmjs44kn2x2r4556y1mgi";
}; };
tools = fetchgit { tools = fetchgit {
url = https://github.com/golang/tools.git; url = https://github.com/golang/tools.git;
@ -18,7 +18,7 @@ let
in in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "go-1.4"; name = "go-1.4.1";
src = srcs.golang; src = srcs.golang;
@ -31,10 +31,6 @@ stdenv.mkDerivation {
mkdir -p $out/share mkdir -p $out/share
cd $out/share cd $out/share
''; '';
postUnpack = ''
mkdir -p $out/share/go/src/golang.org/x
cp -rv --no-preserve=mode,ownership ${srcs.tools} $out/share/go/src/golang.org/x/tools
'';
prePatch = '' prePatch = ''
# Ensure that the source directory is named go # Ensure that the source directory is named go
@ -42,6 +38,10 @@ stdenv.mkDerivation {
if [ ! -d go ]; then if [ ! -d go ]; then
mv * go mv * go
fi fi
mkdir -p $out/share/go/src/golang.org/x
cp -r --no-preserve=mode,ownership ${srcs.tools} $out/share/go/src/golang.org/x/tools
cd go cd go
patchShebangs ./ # replace /bin/bash patchShebangs ./ # replace /bin/bash