summary refs log tree commit diff
path: root/pkgs/servers
diff options
context:
space:
mode:
authorFrederik Rietdijk <fridh@fridh.nl>2018-04-04 19:36:39 +0200
committerFrederik Rietdijk <fridh@fridh.nl>2018-04-04 19:36:39 +0200
commit23741692fabcdfee9a8b7f89576236a69d4d4d8a (patch)
treeb3d53e3f97547c93bba340176bee375cb720ebdc /pkgs/servers
parentd051989efa7354384271bb21c5f471cfc05c1541 (diff)
parentb9484875bcc1918945d373e0ea46ffff938adb05 (diff)
downloadnixpkgs-23741692fabcdfee9a8b7f89576236a69d4d4d8a.tar
nixpkgs-23741692fabcdfee9a8b7f89576236a69d4d4d8a.tar.gz
nixpkgs-23741692fabcdfee9a8b7f89576236a69d4d4d8a.tar.bz2
nixpkgs-23741692fabcdfee9a8b7f89576236a69d4d4d8a.tar.lz
nixpkgs-23741692fabcdfee9a8b7f89576236a69d4d4d8a.tar.xz
nixpkgs-23741692fabcdfee9a8b7f89576236a69d4d4d8a.tar.zst
nixpkgs-23741692fabcdfee9a8b7f89576236a69d4d4d8a.zip
Merge master into staging
Diffstat (limited to 'pkgs/servers')
-rw-r--r--pkgs/servers/minio/default.nix4
-rw-r--r--pkgs/servers/nosql/arangodb/default.nix4
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix
index 90a95987267..786a188bbfd 100644
--- a/pkgs/servers/minio/default.nix
+++ b/pkgs/servers/minio/default.nix
@@ -3,13 +3,13 @@
 buildGoPackage rec {
   name = "minio-${version}";
 
-  version = "2018-03-19T19-22-06Z";
+  version = "2018-03-30T00-38-44Z";
 
   src = fetchFromGitHub {
     owner = "minio";
     repo = "minio";
     rev = "RELEASE.${version}";
-    sha256 = "0cqvam7i8caqlb0jdn89s1k18gfy4yndsszj7d81qg2sns0p5zgm";
+    sha256 = "17vam9ifi632yfxakanxi2660wqgqrhrhhzywrgh2jmzljippf80";
   };
 
   goPackagePath = "github.com/minio/minio";
diff --git a/pkgs/servers/nosql/arangodb/default.nix b/pkgs/servers/nosql/arangodb/default.nix
index 75ba1f6a940..9d1e6213665 100644
--- a/pkgs/servers/nosql/arangodb/default.nix
+++ b/pkgs/servers/nosql/arangodb/default.nix
@@ -3,14 +3,14 @@
 
 let
 in stdenv.mkDerivation rec {
-  version = "3.3.4";
+  version = "3.3.5";
   name    = "arangodb-${version}";
 
   src = fetchFromGitHub {
     repo = "arangodb";
     owner = "arangodb";
     rev = "v${version}";
-    sha256 = "0gfjmva043f9nhqjpa0qy2cdbz84z7b1c2wgcy77i3wnskicy0pc";
+    sha256 = "1015fi47m0j71l6wmp7n06qk0x2h3337sjqxfyan5dnnb0himzb6";
   };
 
   buildInputs = [