summary refs log tree commit diff
diff options
context:
space:
mode:
authorMario Rodas <marsam@users.noreply.github.com>2020-05-02 04:20:00 -0500
committerMario Rodas <marsam@users.noreply.github.com>2020-05-02 04:20:00 -0500
commitbb7b63ac0b45a8314fd752c6876ba6294fc67bc4 (patch)
treed51d9af8d8b02c6dac8c3f753fa9b04e8033607b
parentd7e1e8467ae7434b3362655ae5261408df6723bd (diff)
downloadnixpkgs-bb7b63ac0b45a8314fd752c6876ba6294fc67bc4.tar
nixpkgs-bb7b63ac0b45a8314fd752c6876ba6294fc67bc4.tar.gz
nixpkgs-bb7b63ac0b45a8314fd752c6876ba6294fc67bc4.tar.bz2
nixpkgs-bb7b63ac0b45a8314fd752c6876ba6294fc67bc4.tar.lz
nixpkgs-bb7b63ac0b45a8314fd752c6876ba6294fc67bc4.tar.xz
nixpkgs-bb7b63ac0b45a8314fd752c6876ba6294fc67bc4.tar.zst
nixpkgs-bb7b63ac0b45a8314fd752c6876ba6294fc67bc4.zip
nixosTests.minio: update minio-client command
-rw-r--r--nixos/tests/minio.nix2
-rw-r--r--pkgs/servers/minio/default.nix4
2 files changed, 4 insertions, 2 deletions
diff --git a/nixos/tests/minio.nix b/nixos/tests/minio.nix
index 3b061974267..02d1f7aa6c2 100644
--- a/nixos/tests/minio.nix
+++ b/nixos/tests/minio.nix
@@ -44,7 +44,7 @@ in {
 
     # Create a test bucket on the server
     machine.succeed(
-        "mc config host add minio http://localhost:9000 ${accessKey} ${secretKey} S3v4"
+        "mc config host add minio http://localhost:9000 ${accessKey} ${secretKey} --api s3v4"
     )
     machine.succeed("mc mb minio/test-bucket")
     machine.succeed("${minioPythonScript}")
diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix
index 237193692d7..8b30d7dbbc8 100644
--- a/pkgs/servers/minio/default.nix
+++ b/pkgs/servers/minio/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub }:
+{ stdenv, buildGoModule, fetchFromGitHub, nixosTests }:
 
 buildGoModule rec {
   pname = "minio";
@@ -19,6 +19,8 @@ buildGoModule rec {
     -s -w -X github.com/minio/minio/cmd.Version=${version}
   ''];
 
+  passthru.tests.minio = nixosTests.minio;
+
   meta = with stdenv.lib; {
     homepage = "https://www.minio.io/";
     description = "An S3-compatible object storage server";