diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2018-04-04 19:36:39 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-04-04 19:36:39 +0200 |
| commit | 23741692fabcdfee9a8b7f89576236a69d4d4d8a (patch) | |
| tree | b3d53e3f97547c93bba340176bee375cb720ebdc /pkgs/tools/networking | |
| parent | d051989efa7354384271bb21c5f471cfc05c1541 (diff) | |
| parent | b9484875bcc1918945d373e0ea46ffff938adb05 (diff) | |
| download | nixlib-23741692fabcdfee9a8b7f89576236a69d4d4d8a.tar nixlib-23741692fabcdfee9a8b7f89576236a69d4d4d8a.tar.gz nixlib-23741692fabcdfee9a8b7f89576236a69d4d4d8a.tar.bz2 nixlib-23741692fabcdfee9a8b7f89576236a69d4d4d8a.tar.lz nixlib-23741692fabcdfee9a8b7f89576236a69d4d4d8a.tar.xz nixlib-23741692fabcdfee9a8b7f89576236a69d4d4d8a.tar.zst nixlib-23741692fabcdfee9a8b7f89576236a69d4d4d8a.zip | |
Merge master into staging
Diffstat (limited to 'pkgs/tools/networking')
| -rw-r--r-- | pkgs/tools/networking/mailutils/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/networking/minio-client/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/networking/p2p/libtorrent/default.nix | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/tools/networking/mailutils/default.nix b/pkgs/tools/networking/mailutils/default.nix index 6f47b4b55766..c85aaea6f3b9 100644 --- a/pkgs/tools/networking/mailutils/default.nix +++ b/pkgs/tools/networking/mailutils/default.nix @@ -34,7 +34,7 @@ in stdenv.mkDerivation rec { ]; doCheck = true; - enableParallelBuilding = true; + enableParallelBuilding = false; hardeningDisable = [ "format" ]; configureFlags = [ diff --git a/pkgs/tools/networking/minio-client/default.nix b/pkgs/tools/networking/minio-client/default.nix index 7538c08249c0..bfe7dfc2dc0d 100644 --- a/pkgs/tools/networking/minio-client/default.nix +++ b/pkgs/tools/networking/minio-client/default.nix @@ -3,13 +3,13 @@ buildGoPackage rec { name = "minio-client-${version}"; - version = "2018-02-09T23-07-36Z"; + version = "2018-03-25T01-22-22Z"; src = fetchFromGitHub { owner = "minio"; repo = "mc"; rev = "RELEASE.${version}"; - sha256 = "1mzjqcvl8740jkkrsyycwqminnd0vdl1m2mvq8hnywj8hs816bfd"; + sha256 = "1x71va37jaqsi99d0i0mccybrs9kjgmpfsm0dchmc58mmhyagh3k"; }; goPackagePath = "github.com/minio/mc"; diff --git a/pkgs/tools/networking/p2p/libtorrent/default.nix b/pkgs/tools/networking/p2p/libtorrent/default.nix index 87785f50e6fa..87cf6d172c0c 100644 --- a/pkgs/tools/networking/p2p/libtorrent/default.nix +++ b/pkgs/tools/networking/p2p/libtorrent/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { homepage = "http://rtorrent.net/downloads/"; description = "A BitTorrent library written in C++ for *nix, with focus on high performance and good code"; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ ebzzry codyopel ]; }; } |