Merge master into staging-next

This commit is contained in:
Frederik Rietdijk
2019-07-19 16:33:38 +02:00
127 changed files with 4167 additions and 1404 deletions
+3 -3
View File
@@ -30,11 +30,11 @@ in
stdenv.mkDerivation rec {
pname = "go";
version = "1.11.11";
version = "1.11.12";
src = fetchurl {
url = "https://dl.google.com/go/go${version}.src.tar.gz";
sha256 = "130g5lhg4h5xwa6chvxfi80nvdx8qb26xfbamzgyc8i5xwrprzqz";
sha256 = "09k9zmq7hhgg0bf1y7rwa0kn7q1vkkr94cmg2iv9lq3najh5nykd";
};
# perl is used for testing go vet
@@ -226,7 +226,7 @@ stdenv.mkDerivation rec {
homepage = http://golang.org/;
description = "The Go Programming language";
license = licenses.bsd3;
maintainers = with maintainers; [ cstrahan orivej velovix mic92 ];
maintainers = with maintainers; [ cstrahan orivej velovix mic92 rvolosatovs ];
platforms = platforms.linux ++ platforms.darwin;
};
}
+3 -3
View File
@@ -30,11 +30,11 @@ in
stdenv.mkDerivation rec {
pname = "go";
version = "1.12.6";
version = "1.12.7";
src = fetchurl {
url = "https://dl.google.com/go/go${version}.src.tar.gz";
sha256 = "1jmlj8pygg4hjpkziicihcf76lz61w1qljdpm3hqlqsmfk65qv69";
sha256 = "04rvwj69gmw3bz8pw5pf10r21ar0pgpnswp15nkddf04dxyl9s4m";
};
# perl is used for testing go vet
@@ -233,7 +233,7 @@ stdenv.mkDerivation rec {
homepage = http://golang.org/;
description = "The Go Programming language";
license = licenses.bsd3;
maintainers = with maintainers; [ cstrahan orivej velovix mic92 ];
maintainers = with maintainers; [ cstrahan orivej velovix mic92 rvolosatovs ];
platforms = platforms.linux ++ platforms.darwin;
};
}