From 6247872c787adf7deb6c27807bf0e0991528f298 Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Tue, 13 Feb 2018 21:48:34 +0100 Subject: [PATCH 1/3] minio: 2018-01-18T20-33-21Z -> 2018-02-09T22-40-05Z --- pkgs/servers/minio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix index b553a202286..614416ec83e 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"; From dfba6485bb276eb8a12364272220983919bca68a Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Tue, 13 Feb 2018 21:49:30 +0100 Subject: [PATCH 2/3] minio-client: 2017-02-06T20-16-19Z -> 2018-02-09T23-07-36Z The package is reworked to make use of buildGoPackage --- .../tools/networking/minio-client/default.nix | 45 +++++++------------ 1 file changed, 17 insertions(+), 28 deletions(-) diff --git a/pkgs/tools/networking/minio-client/default.nix b/pkgs/tools/networking/minio-client/default.nix index 303204c9c21..7498f116e77 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.linux; + license = licenses.asl20; }; } From 827d1bd6186c7312a75b630521396a31eb39e715 Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Tue, 13 Feb 2018 21:54:04 +0100 Subject: [PATCH 3/3] minio,minio-client: support on all unix platforms Minio 32bit support seems to be fixed: https://github.com/minio/minio/pull/4921 --- pkgs/servers/minio/default.nix | 2 +- pkgs/tools/networking/minio-client/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix index 614416ec83e..ea77b32a866 100644 --- a/pkgs/servers/minio/default.nix +++ b/pkgs/servers/minio/default.nix @@ -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 7498f116e77..7538c08249c 100644 --- a/pkgs/tools/networking/minio-client/default.nix +++ b/pkgs/tools/networking/minio-client/default.nix @@ -22,7 +22,7 @@ buildGoPackage rec { homepage = https://github.com/minio/mc; description = "A replacement for ls, cp, mkdir, diff and rsync commands for filesystems and object storage"; maintainers = with maintainers; [ eelco bachp ]; - platforms = platforms.linux; + platforms = platforms.unix; license = licenses.asl20; }; }