Merge pull request #16093 from rushmorem/update-go
go: v1.5.3 -> v1.5.4
This commit is contained in:
commit
902b6d5691
|
@ -1,4 +1,4 @@
|
||||||
{ stdenv, lib, fetchurl, tzdata, iana_etc, go_1_4, runCommand
|
{ stdenv, lib, fetchFromGitHub, tzdata, iana_etc, go_1_4, runCommand
|
||||||
, perl, which, pkgconfig, patch
|
, perl, which, pkgconfig, patch
|
||||||
, pcre
|
, pcre
|
||||||
, Security, Foundation }:
|
, Security, Foundation }:
|
||||||
|
@ -15,11 +15,13 @@ in
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "go-${version}";
|
name = "go-${version}";
|
||||||
version = "1.5.3";
|
version = "1.5.4";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchFromGitHub {
|
||||||
url = "https://github.com/golang/go/archive/go${version}.tar.gz";
|
owner = "golang";
|
||||||
sha256 = "1n2niq0147pqflqh8j1s5wv8aq3vlh58ni3bp9add261z5q1g50k";
|
repo = "go";
|
||||||
|
rev = "go${version}";
|
||||||
|
sha256 = "1lvk9awmkjbz5z4snv3q3b3r7ijfz97kig2wkqz6jmr7b0lp1fcy";
|
||||||
};
|
};
|
||||||
|
|
||||||
# perl is used for testing go vet
|
# perl is used for testing go vet
|
||||||
|
|
|
@ -41,5 +41,6 @@ stdenv.mkDerivation rec {
|
||||||
meta = {
|
meta = {
|
||||||
homepage = http://viric.name/cgi-bin/storebrowse;
|
homepage = http://viric.name/cgi-bin/storebrowse;
|
||||||
license = stdenv.lib.licenses.agpl3Plus;
|
license = stdenv.lib.licenses.agpl3Plus;
|
||||||
|
broken = true;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -4549,7 +4549,7 @@ in
|
||||||
inherit (darwin.apple_sdk.frameworks) Security Foundation;
|
inherit (darwin.apple_sdk.frameworks) Security Foundation;
|
||||||
};
|
};
|
||||||
|
|
||||||
go = self.go_1_5;
|
go = self.go_1_6;
|
||||||
|
|
||||||
go-repo-root = (callPackage ../development/tools/go-repo-root { }).bin;
|
go-repo-root = (callPackage ../development/tools/go-repo-root { }).bin;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue