From 1983e6c8ccdd631e3bbf325b9c5b58b61fd7f63e Mon Sep 17 00:00:00 2001
From: Pascal Bach <pascal.bach@nextrem.ch>
Date: Sun, 1 Oct 2017 20:58:28 +0200
Subject: [PATCH] minio: 20170613 -> 2017-09-29T19-16-56Z

The test was updated as minio now needs at least 1 GiB of free disk,
otherwise it won't start.
---
 nixos/tests/minio.nix          |  4 +++-
 pkgs/servers/minio/default.nix | 13 ++++++-------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/nixos/tests/minio.nix b/nixos/tests/minio.nix
index a349265b2f5..07a292a9baa 100644
--- a/nixos/tests/minio.nix
+++ b/nixos/tests/minio.nix
@@ -12,6 +12,9 @@ import ./make-test.nix ({ pkgs, ...} : {
         secretKey = "V7f1CwQqAcwo80UEIJEjc5gVQUSSx5ohQ9GSrr12";
       };
       environment.systemPackages = [ pkgs.minio-client ];
+
+      # Minio requires at least 1GiB of free disk space to run.
+      virtualisation.diskSize = 4 * 1024;
     };
   };
 
@@ -20,7 +23,6 @@ import ./make-test.nix ({ pkgs, ...} : {
       startAll;
       $machine->waitForUnit("minio.service");
       $machine->waitForOpenPort(9000);
-      $machine->succeed("curl --fail http://localhost:9000/minio/index.html");
 
       # Create a test bucket on the server
       $machine->succeed("mc config host add minio http://localhost:9000 BKIKJAA5BMMU2RHO6IBB V7f1CwQqAcwo80UEIJEjc5gVQUSSx5ohQ9GSrr12 S3v4");
diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix
index 48b5279772a..c9dfe9136df 100644
--- a/pkgs/servers/minio/default.nix
+++ b/pkgs/servers/minio/default.nix
@@ -1,14 +1,13 @@
 { lib, stdenv, fetchurl, go }:
 
 stdenv.mkDerivation rec {
-  name = "minio-${shortVersion}";
+  name = "minio-${version}";
 
-  shortVersion = "20170613";
-  longVersion = "2017-06-13T19-01-01Z";
+  version = "2017-09-29T19-16-56Z";
 
   src = fetchurl {
-    url = "https://github.com/minio/minio/archive/RELEASE.${lib.replaceStrings [":"] ["-"] longVersion}.tar.gz";
-    sha256 = "1rrlgn0nsvfn0lr9ffihjdb96n4znsvjlz1h7bwvz8nwhbn0lfsf";
+    url = "https://github.com/minio/minio/archive/RELEASE.${version}.tar.gz";
+    sha256 = "1h028gyfvyh5x6k4fsj4s64sgzqy7jgln6kvs27bnxzigj6dp2wx";
   };
 
   buildInputs = [ go ];
@@ -24,7 +23,7 @@ stdenv.mkDerivation rec {
   buildPhase = ''
     mkdir -p $out/bin
     go build -o $out/bin/minio \
-      --ldflags "-X github.com/minio/minio/cmd.Version=${longVersion}"
+      --ldflags "-X github.com/minio/minio/cmd.Version=${version}"
   '';
 
   installPhase = "true";
@@ -32,7 +31,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = https://www.minio.io/;
     description = "An S3-compatible object storage server";
-    maintainers = [ lib.maintainers.eelco ];
+    maintainers = with lib.maintainers; [ eelco bachp ];
     platforms = lib.platforms.x86_64;
     license = lib.licenses.asl20;
   };