diff --git a/pkgs/applications/networking/pond/default.nix b/pkgs/applications/networking/pond/default.nix index 9d3954d839ba..31a7dcd1f561 100644 --- a/pkgs/applications/networking/pond/default.nix +++ b/pkgs/applications/networking/pond/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchgit, fetchhg, go, trousers }: +{ stdenv, lib, fetchgit, fetchhg, go_1_3, trousers }: let deps = import ./deps.nix { inherit stdenv lib fetchgit fetchhg; @@ -7,7 +7,7 @@ let deps = import ./deps.nix { in stdenv.mkDerivation rec { name = "pond"; - buildInputs = [ go trousers ]; + buildInputs = [ go_1_3 trousers ]; unpackPhase = '' export GOPATH=$PWD diff --git a/pkgs/development/compilers/go/1.4.nix b/pkgs/development/compilers/go/1.4.nix new file mode 100644 index 000000000000..b1437da0e733 --- /dev/null +++ b/pkgs/development/compilers/go/1.4.nix @@ -0,0 +1,105 @@ +{ stdenv, lib, fetchurl, fetchgit, bison, glibc, bash, coreutils, makeWrapper, tzdata, iana_etc, perl }: + +let + loader386 = "${glibc}/lib/ld-linux.so.2"; + loaderAmd64 = "${glibc}/lib/ld-linux-x86-64.so.2"; + loaderArm = "${glibc}/lib/ld-linux.so.3"; + srcs = { + golang = fetchurl { + url = https://storage.googleapis.com/golang/go1.4.src.tar.gz; + sha1 = "6a7d9bd90550ae1e164d7803b3e945dc8309252b"; + }; + tools = fetchgit { + url = https://github.com/golang/tools.git; + rev = "c836fe615a448dbf9ff5448c1aa657479a0d0aeb"; + sha256 = "0q9jnhmgmm3xzjss7ndsi6nyykmmb1y984n98118c2sipi183xp5"; + }; + }; +in + +stdenv.mkDerivation { + name = "go-1.4"; + + src = srcs.golang; + + # perl is used for testing go vet + buildInputs = [ bison bash makeWrapper perl ] ++ lib.optionals stdenv.isLinux [ glibc ] ; + + # I'm not sure what go wants from its 'src', but the go installation manual + # describes an installation keeping the src. + preUnpack = '' + mkdir -p $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 = '' + # Ensure that the source directory is named go + cd .. + if [ ! -d go ]; then + mv * go + fi + cd go + patchShebangs ./ # replace /bin/bash + + # Disabling the 'os/http/net' tests (they want files not available in + # chroot builds) + rm src/net/{multicast_test.go,parse_test.go,port_test.go} + # !!! substituteInPlace does not seems to be effective. + # The os test wants to read files in an existing path. Just don't let it be /usr/bin. + sed -i 's,/usr/bin,'"`pwd`", src/os/os_test.go + sed -i 's,/bin/pwd,'"`type -P pwd`", src/os/os_test.go + # Disable the unix socket test + sed -i '/TestShutdownUnix/areturn' src/net/net_test.go + # Disable the hostname test + sed -i '/TestHostname/areturn' src/os/os_test.go + sed -i 's,/etc/protocols,${iana_etc}/etc/protocols,' src/net/lookup_unix.go + # ParseInLocation fails the test + sed -i '/TestParseInSydney/areturn' src/time/format_test.go + '' + lib.optionalString stdenv.isLinux '' + sed -i 's,/usr/share/zoneinfo/,${tzdata}/share/zoneinfo/,' src/time/zoneinfo_unix.go + sed -i 's,/lib/ld-linux.so.3,${loaderArm},' src/cmd/5l/asm.c + sed -i 's,/lib64/ld-linux-x86-64.so.2,${loaderAmd64},' src/cmd/6l/asm.c + sed -i 's,/lib/ld-linux.so.2,${loader386},' src/cmd/8l/asm.c + ''; + + patches = [ ./cacert-1.4.patch ]; + + GOOS = if stdenv.isDarwin then "darwin" else "linux"; + GOARCH = if stdenv.isDarwin then "amd64" + else if stdenv.system == "i686-linux" then "386" + else if stdenv.system == "x86_64-linux" then "amd64" + else if stdenv.system == "armv5tel-linux" then "arm" + else throw "Unsupported system"; + GOARM = stdenv.lib.optionalString (stdenv.system == "armv5tel-linux") "5"; + GO386 = 387; # from Arch: don't assume sse2 on i686 + CGO_ENABLED = if stdenv.isDarwin then 0 else 1; + + installPhase = '' + export CC=cc + mkdir -p "$out/bin" + export GOROOT="$(pwd)/" + export GOBIN="$out/bin" + export PATH="$GOBIN:$PATH" + cd ./src + ./all.bash + cd - + + # Build extra tooling + # TODO: Fix godoc tests + TOOL_ROOT=golang.org/x/tools/cmd + go install -v $TOOL_ROOT/cover $TOOL_ROOT/vet $TOOL_ROOT/godoc + go test -v $TOOL_ROOT/cover $TOOL_ROOT/vet # $TOOL_ROOT/godoc + ''; + + meta = { + homepage = http://golang.org/; + description = "The Go Programming language"; + license = "BSD"; + maintainers = with stdenv.lib.maintainers; [ cstrahan ]; + platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; + }; +} diff --git a/pkgs/development/compilers/go/cacert-1.4.patch b/pkgs/development/compilers/go/cacert-1.4.patch new file mode 100644 index 000000000000..5346d3f39505 --- /dev/null +++ b/pkgs/development/compilers/go/cacert-1.4.patch @@ -0,0 +1,14 @@ +Go comes with hardcoded cacert. We add the usual in NixOS, +for easier NixOS life. + +diff -r 14854533dcc7 src/crypto/x509/root_unix.go +--- a/src/crypto/x509/root_unix.go Thu Dec 11 11:27:56 2014 +1100 ++++ b/src/crypto/x509/root_unix.go Tue Jan 06 00:41:31 2015 -0600 +@@ -17,6 +17,7 @@ + "/usr/local/share/certs/ca-root-nss.crt", // FreeBSD/DragonFly + "/etc/pki/tls/cacert.pem", // OpenELEC + "/etc/certs/ca-certificates.crt", // Solaris 11.2+ ++ "/etc/ssl/certs/ca-bundle.crt", // NixOS + } + + // Possible directories with certificate files; stop after successfully diff --git a/pkgs/development/compilers/go/gox.nix b/pkgs/development/compilers/go/gox.nix index da40b7570fe5..932c3967726c 100644 --- a/pkgs/development/compilers/go/gox.nix +++ b/pkgs/development/compilers/go/gox.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, go, fetchFromGitHub }: +{ stdenv, lib, go_1_3, fetchFromGitHub }: let goDeps = [ @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { src = sources; - propagatedBuildInputs = [ go ]; + propagatedBuildInputs = [ go_1_3 ]; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/development/tools/golint/default.nix b/pkgs/development/tools/golint/default.nix index b9292f6fa117..83dd50f8d4cb 100644 --- a/pkgs/development/tools/golint/default.nix +++ b/pkgs/development/tools/golint/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, go, fetchurl, fetchgit, fetchhg, fetchbzr, fetchFromGitHub }: +{ stdenv, lib, go_1_3, fetchurl, fetchgit, fetchhg, fetchbzr, fetchFromGitHub }: stdenv.mkDerivation rec { name = "golint"; @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { inherit stdenv lib fetchgit fetchhg fetchbzr fetchFromGitHub; }; - buildInputs = [ go ]; + buildInputs = [ go_1_3 ]; buildPhase = '' export GOPATH=$src diff --git a/pkgs/tools/misc/logstash-forwarder/default.nix b/pkgs/tools/misc/logstash-forwarder/default.nix index 0874ef38eb3d..a20b1d577754 100644 --- a/pkgs/tools/misc/logstash-forwarder/default.nix +++ b/pkgs/tools/misc/logstash-forwarder/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, go }: +{ stdenv, fetchgit, go_1_3 }: stdenv.mkDerivation { name = "logstash-forwarder-20141216"; src = fetchgit { @@ -6,7 +6,7 @@ stdenv.mkDerivation { rev = "6082bd8aaecb2180f5b56f4fb1b2940a6935ef7b"; sha256 = "1686rlx5p7d2806cg8y4376m4l7nvg1yjgg52ccrs0v4fnqs6292"; }; - buildInputs = [ go ]; + buildInputs = [ go_1_3 ]; installPhase = '' mkdir -p $out/bin cp build/bin/logstash-forwarder $out/bin diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c3b45fbc8212..a740202ecbda 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3418,7 +3418,9 @@ let go_1_3 = callPackage ../development/compilers/go/1.3.nix { }; - go = go_1_3; + go_1_4 = callPackage ../development/compilers/go/1.4.nix { }; + + go = go_1_4; go-repo-root = callPackage ../development/tools/misc/go-repo-root { };