From 02b121bf85433d7501ee99a44e6a558998091f84 Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Sun, 16 May 2021 10:38:36 +0100 Subject: [PATCH 1/3] minio: fix license change Update from #123130 has moved from Apache 2.0 to AGPLv3 --- pkgs/servers/minio/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix index ae27fe751deb..47a790bd1976 100644 --- a/pkgs/servers/minio/default.nix +++ b/pkgs/servers/minio/default.nix @@ -51,6 +51,6 @@ buildGoModule rec { description = "An S3-compatible object storage server"; maintainers = with maintainers; [ eelco bachp ]; platforms = platforms.unix; - license = licenses.asl20; + license = licenses.agpl3Plus; }; } From acec233fcdca924e87e669ef548f7d0c24bd3ede Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Sun, 16 May 2021 10:42:06 +0100 Subject: [PATCH 2/3] minio: set version variables with ldflags Set version variables with ldflags rather than sed in a postPatch phase Also means that CGO_ENABLED and -tags=kqueue can be set in the same place Add changelog --- pkgs/servers/minio/default.nix | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix index 47a790bd1976..2534322befd4 100644 --- a/pkgs/servers/minio/default.nix +++ b/pkgs/servers/minio/default.nix @@ -30,25 +30,18 @@ buildGoModule rec { subPackages = [ "." ]; - postPatch = '' - sed -i "s/Version.*/Version = \"${versionToTimestamp version}\"/g" cmd/build-constants.go - sed -i "s/ReleaseTag.*/ReleaseTag = \"RELEASE.${version}\"/g" cmd/build-constants.go - sed -i "s/CommitID.*/CommitID = \"${src.rev}\"/g" cmd/build-constants.go - ''; - - postConfigure = '' - export CGO_ENABLED=0 - ''; - - buildFlagsArray = [ - "-tags=kqueue" - ]; + preBuild = let t = "github.com/minio/minio/cmd"; in + '' + export CGO_ENABLED=0 + buildFlagsArray+=("-tags" "kqueue" "-ldflags" "-s -w -X ${t}.Version=${versionToTimestamp version} -X ${t}.ReleaseTag=RELEASE.${version} -X ${t}.CommitID=${src.rev}") + ''; passthru.tests.minio = nixosTests.minio; meta = with lib; { homepage = "https://www.minio.io/"; description = "An S3-compatible object storage server"; + changelog = "https://github.com/minio/minio/releases/tag/RELEASE.${version}"; maintainers = with maintainers; [ eelco bachp ]; platforms = platforms.unix; license = licenses.agpl3Plus; From 3fbdcefe1d133f9a1d8a870bbd79eacb6ca6dc05 Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Sun, 16 May 2021 10:58:07 +0100 Subject: [PATCH 3/3] minio: 2021-05-11T23-27-41Z -> 2021-05-16T05-32-34Z --- pkgs/servers/minio/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix index 2534322befd4..d244abf2e68c 100644 --- a/pkgs/servers/minio/default.nix +++ b/pkgs/servers/minio/default.nix @@ -15,16 +15,16 @@ let in buildGoModule rec { pname = "minio"; - version = "2021-05-11T23-27-41Z"; + version = "2021-05-16T05-32-34Z"; src = fetchFromGitHub { owner = "minio"; repo = "minio"; rev = "RELEASE.${version}"; - sha256 = "0yljq4lm9maz73ha9m38ljv977999p57rfkzybgzbjjrijgszm2b"; + sha256 = "sha256-+zanqJMYNg/1c20cMm+bqVsW8VquucxEK5NiFAqOmS0="; }; - vendorSha256 = "1dm8nbg86zvxakc7h4dafqb035sc5x6viz8p409l22l695qrp6bi"; + vendorSha256 = "sha256-5aDD68nugFyWsySLEj7LXAdtFXFKWnqfz+5zF5wC2qw="; doCheck = false;