From 10e7572d17dcfece53a9b25a55daf5766a0c8c35 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Mon, 9 Feb 2015 10:15:02 +0100
Subject: [PATCH] Use go1.4 instead of go-1.4 in derivation names. Closes #6243

I chose meta.branch because go 1.1 and 1.2 had this already.
---
 pkgs/development/compilers/go/1.3.nix           | 1 +
 pkgs/development/compilers/go/1.4.nix           | 1 +
 pkgs/development/go-modules/generic/default.nix | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/go/1.3.nix b/pkgs/development/compilers/go/1.3.nix
index 47132023e5af..6d88049cfbee 100644
--- a/pkgs/development/compilers/go/1.3.nix
+++ b/pkgs/development/compilers/go/1.3.nix
@@ -103,6 +103,7 @@ stdenv.mkDerivation {
   setupHook = ./setup-hook.sh;
 
   meta = {
+    branch = "1.3";
     homepage = http://golang.org/;
     description = "The Go Programming language";
     license = "BSD";
diff --git a/pkgs/development/compilers/go/1.4.nix b/pkgs/development/compilers/go/1.4.nix
index b1558e56cec7..9acb399aa1b4 100644
--- a/pkgs/development/compilers/go/1.4.nix
+++ b/pkgs/development/compilers/go/1.4.nix
@@ -98,6 +98,7 @@ stdenv.mkDerivation {
   setupHook = ./setup-hook.sh;
 
   meta = {
+    branch = "1.4";
     homepage = http://golang.org/;
     description = "The Go Programming language";
     license = "BSD";
diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix
index 5dcfa4502aca..8fed5a55be06 100644
--- a/pkgs/development/go-modules/generic/default.nix
+++ b/pkgs/development/go-modules/generic/default.nix
@@ -8,7 +8,7 @@
 , meta ? {}, ... } @ args:
 
 go.stdenv.mkDerivation ( args // {
-  name = "${go.name}-${name}";
+  name = "go${go.meta.branch}-${name}";
   buildInputs = [ go ] ++ buildInputs;
 
   configurePhase = args.configurePhase or ''