diff options
-rw-r--r-- | pkgs/servers/minio/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/networking/minio-client/default.nix | 45 |
2 files changed, 20 insertions, 31 deletions
diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix index b553a2022864..ea77b32a8666 100644 --- a/pkgs/servers/minio/default.nix +++ b/pkgs/servers/minio/default.nix @@ -3,13 +3,13 @@ buildGoPackage rec { name = "minio-${version}"; - version = "2018-01-18T20-33-21Z"; + version = "2018-02-09T22-40-05Z"; src = fetchFromGitHub { owner = "minio"; repo = "minio"; rev = "RELEASE.${version}"; - sha256 = "102rilh1kjf9y6g6y83ikk42w7g1sbld11md3wm54hynyh956xrs"; + sha256 = "0qxrzmkm5hza5xbx9dkrgadwjg3hykwf79hix3s0laqyksmpj9mk"; }; goPackagePath = "github.com/minio/minio"; @@ -22,7 +22,7 @@ buildGoPackage rec { homepage = https://www.minio.io/; description = "An S3-compatible object storage server"; maintainers = with maintainers; [ eelco bachp ]; - platforms = platforms.x86_64 ++ ["aarch64-linux"]; + platforms = platforms.unix; license = licenses.asl20; }; } diff --git a/pkgs/tools/networking/minio-client/default.nix b/pkgs/tools/networking/minio-client/default.nix index 303204c9c21e..7538c08249c0 100644 --- a/pkgs/tools/networking/minio-client/default.nix +++ b/pkgs/tools/networking/minio-client/default.nix @@ -1,39 +1,28 @@ -{ lib, stdenv, fetchurl, go }: +{ stdenv, buildGoPackage, fetchFromGitHub }: -stdenv.mkDerivation rec { - name = "minio-client-${shortVersion}"; +buildGoPackage rec { + name = "minio-client-${version}"; - shortVersion = "20170206"; - longVersion = "2017-02-06T20-16-19Z"; + version = "2018-02-09T23-07-36Z"; - src = fetchurl { - url = "https://github.com/minio/mc/archive/RELEASE.${lib.replaceStrings [":"] ["-"] longVersion}.tar.gz"; - sha256 = "0k66kr7x669jvydcxp3rpvg8p9knhmcihpnjiqynhqgrdy16mr1f"; + src = fetchFromGitHub { + owner = "minio"; + repo = "mc"; + rev = "RELEASE.${version}"; + sha256 = "1mzjqcvl8740jkkrsyycwqminnd0vdl1m2mvq8hnywj8hs816bfd"; }; - buildInputs = [ go ]; + goPackagePath = "github.com/minio/mc"; - unpackPhase = '' - d=$TMPDIR/src/github.com/minio/mc - mkdir -p $d - tar xf $src -C $d --strip-component 1 - export GOPATH=$TMPDIR - cd $d - ''; + buildFlagsArray = [''-ldflags= + -X github.com/minio/mc/cmd.Version=${version} + '']; - buildPhase = '' - mkdir -p $out/bin - go build -o $out/bin/minio-client \ - --ldflags "-X github.com/minio/mc/cmd.Version=${longVersion}" - ''; - - installPhase = "ln -s minio-client $out/bin/mc"; - - meta = { + meta = with stdenv.lib; { homepage = https://github.com/minio/mc; description = "A replacement for ls, cp, mkdir, diff and rsync commands for filesystems and object storage"; - maintainers = [ lib.maintainers.eelco ]; - platforms = lib.platforms.linux; - license = lib.licenses.asl20; + maintainers = with maintainers; [ eelco bachp ]; + platforms = platforms.unix; + license = licenses.asl20; }; } |