Merge pull request #29994 from bachp/minio-update

minio: 20170613 -> 2017-09-29T19-16-56Z

authored by

Jörg Thalheim and committed by
GitHub
62922af2 16a43e45

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