diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2018-02-14 21:30:08 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-02-14 21:30:08 +0100 |
| commit | 672bb6b4abd27d9b2796152522b54f5b82c9f76b (patch) | |
| tree | 5b6989f6f2e3bfea9673efa21ef30aa722ad001e /pkgs/tools/networking | |
| parent | e4bfe5aac94ce07115ea068e6b235ddf6e8e71ac (diff) | |
| parent | 303c9794362acec6ce0142b8bcf878202717c99c (diff) | |
| download | nixlib-672bb6b4abd27d9b2796152522b54f5b82c9f76b.tar nixlib-672bb6b4abd27d9b2796152522b54f5b82c9f76b.tar.gz nixlib-672bb6b4abd27d9b2796152522b54f5b82c9f76b.tar.bz2 nixlib-672bb6b4abd27d9b2796152522b54f5b82c9f76b.tar.lz nixlib-672bb6b4abd27d9b2796152522b54f5b82c9f76b.tar.xz nixlib-672bb6b4abd27d9b2796152522b54f5b82c9f76b.tar.zst nixlib-672bb6b4abd27d9b2796152522b54f5b82c9f76b.zip | |
Merge remote-tracking branch 'upstream/master' into HEAD
Diffstat (limited to 'pkgs/tools/networking')
| -rw-r--r-- | pkgs/tools/networking/minio-client/default.nix | 45 | ||||
| -rw-r--r-- | pkgs/tools/networking/tlspool/default.nix | 2 |
2 files changed, 18 insertions, 29 deletions
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; }; } diff --git a/pkgs/tools/networking/tlspool/default.nix b/pkgs/tools/networking/tlspool/default.nix index acb5a042ffcc..80bac726457b 100644 --- a/pkgs/tools/networking/tlspool/default.nix +++ b/pkgs/tools/networking/tlspool/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A supercharged TLS daemon that allows for easy, strong and consistent deployment"; license = licenses.bsd2; - homepage = https://www.tlspool.org; + homepage = http://www.tlspool.org; maintainers = with maintainers; [ leenaars qknight ]; }; } |