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:
parent
441e297fb7
commit
10e7572d17
@ -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";
|
||||
|
@ -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";
|
||||
|
@ -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 ''
|
||||
|
Loading…
Reference in New Issue
Block a user