public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use go1.4 instead of go-1.4 in derivation names. Closes #6243

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkgs/development/compilers/go/1.3.nix
View File

@ -103,6 +103,7 @@ stdenv.mkDerivation {
setupHook = ./setup-hook.sh; setupHook = ./setup-hook.sh;
meta = { meta = {
branch = "1.3";
homepage = http://golang.org/; homepage = http://golang.org/;
description = "The Go Programming language"; description = "The Go Programming language";
license = "BSD"; license = "BSD";

1
pkgs/development/compilers/go/1.4.nix
View File

@ -98,6 +98,7 @@ stdenv.mkDerivation {
setupHook = ./setup-hook.sh; setupHook = ./setup-hook.sh;
meta = { meta = {
branch = "1.4";
homepage = http://golang.org/; homepage = http://golang.org/;
description = "The Go Programming language"; description = "The Go Programming language";
license = "BSD"; license = "BSD";

2
pkgs/development/go-modules/generic/default.nix
View File

@ -8,7 +8,7 @@
, meta ? {}, ... } @ args: , meta ? {}, ... } @ args:
go.stdenv.mkDerivation ( args // { go.stdenv.mkDerivation ( args // {
name = "${go.name}-${name}"; name = "go${go.meta.branch}-${name}";
buildInputs = [ go ] ++ buildInputs; buildInputs = [ go ] ++ buildInputs;
configurePhase = args.configurePhase or '' configurePhase = args.configurePhase or ''