From 2d0243c187eafd51d2273f6e899faac3d54e21f1 Mon Sep 17 00:00:00 2001
From: Bas van Dijk <v.dijk.bas@gmail.com>
Date: Sat, 1 Jun 2019 17:08:09 +0200
Subject: [PATCH] thanos: 0.4.0 -> 0.5.0-rc.0

---
 nixos/modules/services/monitoring/thanos.nix | 11 +----------
 pkgs/servers/monitoring/thanos/default.nix   |  6 +++---
 2 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/nixos/modules/services/monitoring/thanos.nix b/nixos/modules/services/monitoring/thanos.nix
index a34a1ecbfea7..887214057d2b 100644
--- a/nixos/modules/services/monitoring/thanos.nix
+++ b/nixos/modules/services/monitoring/thanos.nix
@@ -122,8 +122,7 @@ let
       grpc-address = mkParamDef types.str "0.0.0.0:10901" ''
         Listen <literal>ip:port</literal> address for gRPC endpoints (StoreAPI).
 
-        Make sure this address is routable from other components if you use gossip,
-        <option>grpc-advertise-address</option> is empty and you require cross-node connection.
+        Make sure this address is routable from other components.
       '';
 
       grpc-server-tls-cert = mkParam types.str ''
@@ -249,14 +248,6 @@ let
 
     query = params.common // {
 
-      http-advertise-address = mkParam types.str ''
-        Explicit (external) <literal>host:port</literal> address to advertise
-        for HTTP QueryAPI in gossip cluster.
-
-        If <literal>null</literal>, the option <option>http-address</option>
-        will be used.
-      '';
-
       grpc-client-tls-secure = mkFlagParam ''
         Use TLS when talking to the gRPC server
       '';
diff --git a/pkgs/servers/monitoring/thanos/default.nix b/pkgs/servers/monitoring/thanos/default.nix
index d9fb1e7cd44f..50dcb7b341ff 100644
--- a/pkgs/servers/monitoring/thanos/default.nix
+++ b/pkgs/servers/monitoring/thanos/default.nix
@@ -8,13 +8,13 @@ let
 in
 buildGoModule rec {
   pname = "thanos";
-  version = "0.4.0";
+  version = "0.5.0-rc.0";
 
   src = fetchFromGitHub {
     rev = "v${version}";
     owner = "improbable-eng";
     repo = "thanos";
-    sha256 = "0md9m7swmxh0sg6vf169iw3p6jc1hxzgylirh6vs1q0frz21y47j";
+    sha256 = "1m7jj5g7s4c7nhbyc6vwn08ripp4d3ciim48siillwhm90gbphrw";
   };
 
   overrideModAttrs = oldAttrs : {
@@ -23,7 +23,7 @@ buildGoModule rec {
     ];
   };
 
-  modSha256 = "0sr9g95qab7x46m3mpahpb2xgzdbpy6p0kn6gq1s5phg2xxj2w00";
+  modSha256 = "1236cg00h8077fmvyddwjsnw85r69ac18b2chcpgzd85xdcaxavk";
 
   subPackages = "cmd/thanos";