Merge pull request #67872 from LnL7/minio-client

minio-client: remove go 1.10 override
This commit is contained in:
adisbladis 2019-09-01 21:46:24 +01:00 committed by GitHub
commit c2fc61c5f7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 7 deletions

View File

@ -2,7 +2,6 @@
buildGoPackage rec { buildGoPackage rec {
pname = "minio-client"; pname = "minio-client";
version = "2019-01-30T19-57-22Z"; version = "2019-01-30T19-57-22Z";
src = fetchFromGitHub { src = fetchFromGitHub {
@ -14,9 +13,9 @@ buildGoPackage rec {
goPackagePath = "github.com/minio/mc"; goPackagePath = "github.com/minio/mc";
buildFlagsArray = [''-ldflags= preBuild = ''
-X github.com/minio/mc/cmd.Version=${version} buildFlagsArray+=("-ldflags=-X github.com/minio/mc/cmd.Version=${version}")
'']; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = https://github.com/minio/mc; homepage = https://github.com/minio/mc;

View File

@ -4781,9 +4781,7 @@ in
minetime = callPackage ../applications/office/minetime { }; minetime = callPackage ../applications/office/minetime { };
minio-client = callPackage ../tools/networking/minio-client { minio-client = callPackage ../tools/networking/minio-client { };
buildGoPackage = buildGo110Package;
};
minissdpd = callPackage ../tools/networking/minissdpd { }; minissdpd = callPackage ../tools/networking/minissdpd { };