From d4039f99fde575fe366e5f519538735c105549fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Tue, 14 May 2013 10:58:48 +0200
Subject: [PATCH] go: 1.1 released

---
 pkgs/development/compilers/go/1.1.nix | 8 ++++----
 pkgs/top-level/all-packages.nix       | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/compilers/go/1.1.nix b/pkgs/development/compilers/go/1.1.nix
index c3cbf8422bf9..39c79e9a3de1 100644
--- a/pkgs/development/compilers/go/1.1.nix
+++ b/pkgs/development/compilers/go/1.1.nix
@@ -7,11 +7,11 @@ let
 in
 
 stdenv.mkDerivation {
-  name = "go-1.1rc1";
+  name = "go-1.1";
 
   src = fetchurl {
-    url = http://go.googlecode.com/files/go1.1rc1.src.tar.gz;
-    sha1 = "c999c36e7bb5c9ef05d309b0bb4275feb62c44e3";
+    url = http://go.googlecode.com/files/go1.1.src.tar.gz;
+    sha1 = "a464704ebbbdd552a39b5f9429b059c117d165b3";
   };
 
   buildInputs = [ bison glibc bash makeWrapper ];
@@ -49,7 +49,7 @@ stdenv.mkDerivation {
     sed -i 's,/bin/pwd,'"`type -P pwd`", src/pkg/os/os_test.go
     # Disable the hostname test
     sed -i '/TestHostname/areturn' src/pkg/os/os_test.go
-    # Disable a failing icmp test
+    # Disable a failing icmp test (maybe because not being root?)
     sed -i '/ip[46]:.*icmp.*nil/d' src/pkg/net/ipraw_test.go
   '';
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1f9722031ae0..4e519a8e9123 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2520,7 +2520,7 @@ let
 
   go = callPackage ../development/compilers/go { };
 
-  go_1_1 = lowPrio (callPackage ../development/compilers/go/1.1.nix { });
+  go_1_1 = callPackage ../development/compilers/go/1.1.nix { };
 
   gprolog = callPackage ../development/compilers/gprolog { };