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.
This commit is contained in:
Luca Bruno 2015-02-09 10:15:02 +01:00
parent 441e297fb7
commit 10e7572d17
3 changed files with 3 additions and 1 deletions

View File

@ -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";

View File

@ -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";

View File

@ -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 ''