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

Merge pull request #16093 from rushmorem/update-go 

go: v1.5.3 -> v1.5.4
This commit is contained in:
Rushmore Mushambi 2016-06-10 00:14:56 +02:00 committed by GitHub
parent 7bd515979c 6e709b180e
commit 902b6d5691
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/development/compilers/go/1.5.nix
View File

@ -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
, pcre
, Security, Foundation }:
@ -15,11 +15,13 @@ in
stdenv.mkDerivation rec {
name = "go-${version}";
version = "1.5.3";
version = "1.5.4";
src = fetchurl {
url = "https://github.com/golang/go/archive/go${version}.tar.gz";
sha256 = "1n2niq0147pqflqh8j1s5wv8aq3vlh58ni3bp9add261z5q1g50k";
src = fetchFromGitHub {
owner = "golang";
repo = "go";
rev = "go${version}";
sha256 = "1lvk9awmkjbz5z4snv3q3b3r7ijfz97kig2wkqz6jmr7b0lp1fcy";
};
# perl is used for testing go vet

1
pkgs/tools/system/storebrowse/default.nix
View File

@ -41,5 +41,6 @@ stdenv.mkDerivation rec {
meta = {
homepage = http://viric.name/cgi-bin/storebrowse;
license = stdenv.lib.licenses.agpl3Plus;
broken = true;
};
}

2
pkgs/top-level/all-packages.nix
View File

@ -4549,7 +4549,7 @@ in
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;