From 465302dad015ed909aad9a78004be55b283e1d1e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 7 May 2020 07:12:08 +0000
Subject: [PATCH 1/3] consul: 1.7.2 -> 1.7.3

---
 pkgs/servers/consul/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/consul/default.nix b/pkgs/servers/consul/default.nix
index 299ad0bdbcb7..6f3ea4262e52 100644
--- a/pkgs/servers/consul/default.nix
+++ b/pkgs/servers/consul/default.nix
@@ -2,7 +2,7 @@
 
 buildGoModule rec {
   pname = "consul";
-  version = "1.7.2";
+  version = "1.7.3";
   rev = "v${version}";
 
   # Note: Currently only release tags are supported, because they have the Consul UI	
@@ -17,14 +17,14 @@ buildGoModule rec {
     owner = "hashicorp";
     repo = pname;
     inherit rev;
-    sha256 = "1q587d8aqfkwg4fymr56fnf038vkxbdqz5yilz96dzny27dhspj4";
+    sha256 = "05p893mfdrlf5fy9ywwnqb7blw1ffidgviyyh6a3bp82wk49f8ph";
   };
 
   # This corresponds to paths with package main - normally unneeded but consul
   # has a split module structure in one repo
   subPackages = ["." "connect/certgen"];
 
-  modSha256 = "164834gr8a7qvp72ccjpkbbg4h8idrcxvcp1fl7yi59iqsswfr7b";
+  modSha256 = "01vyamfy9lcljzy99jmr48x0ypb12wab66n9kmj71mrvl50v8rzr";
 
   preBuild = ''	
   buildFlagsArray+=("-ldflags" "-X github.com/hashicorp/consul/version.GitDescribe=v${version} -X github.com/hashicorp/consul/version.Version=${version} -X github.com/hashicorp/consul/version.VersionPrerelease=")	

From 53b72ba7acd535ec4755302bcc89f0f605677367 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 7 May 2020 17:06:46 +0100
Subject: [PATCH 2/3] consul: reference nixosTests

---
 pkgs/servers/consul/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/consul/default.nix b/pkgs/servers/consul/default.nix
index 6f3ea4262e52..7293618b83a0 100644
--- a/pkgs/servers/consul/default.nix
+++ b/pkgs/servers/consul/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub }:
+{ stdenv, buildGoModule, fetchFromGitHub, nixosTests }:
 
 buildGoModule rec {
   pname = "consul";
@@ -20,6 +20,8 @@ buildGoModule rec {
     sha256 = "05p893mfdrlf5fy9ywwnqb7blw1ffidgviyyh6a3bp82wk49f8ph";
   };
 
+  passthru.tests.consul = nixosTests.consul;
+
   # This corresponds to paths with package main - normally unneeded but consul
   # has a split module structure in one repo
   subPackages = ["." "connect/certgen"];

From 077c3c1944e666fb5cc6863f20a18eb6b9a26265 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 7 May 2020 17:07:05 +0100
Subject: [PATCH 3/3] consul: remove trailing whitespace

---
 pkgs/servers/consul/default.nix | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/pkgs/servers/consul/default.nix b/pkgs/servers/consul/default.nix
index 7293618b83a0..dd6484344e85 100644
--- a/pkgs/servers/consul/default.nix
+++ b/pkgs/servers/consul/default.nix
@@ -5,13 +5,13 @@ buildGoModule rec {
   version = "1.7.3";
   rev = "v${version}";
 
-  # Note: Currently only release tags are supported, because they have the Consul UI	
-  # vendored. See	
-  #   https://github.com/NixOS/nixpkgs/pull/48714#issuecomment-433454834	
-  # If you want to use a non-release commit as `src`, you probably want to improve	
-  # this derivation so that it can build the UI's JavaScript from source.	
-  # See https://github.com/NixOS/nixpkgs/pull/49082 for something like that.	
-  # Or, if you want to patch something that doesn't touch the UI, you may want	
+  # Note: Currently only release tags are supported, because they have the Consul UI
+  # vendored. See
+  #   https://github.com/NixOS/nixpkgs/pull/48714#issuecomment-433454834
+  # If you want to use a non-release commit as `src`, you probably want to improve
+  # this derivation so that it can build the UI's JavaScript from source.
+  # See https://github.com/NixOS/nixpkgs/pull/49082 for something like that.
+  # Or, if you want to patch something that doesn't touch the UI, you may want
   # to apply your changes as patches on top of a release commit.
   src = fetchFromGitHub {
     owner = "hashicorp";
@@ -28,8 +28,11 @@ buildGoModule rec {
 
   modSha256 = "01vyamfy9lcljzy99jmr48x0ypb12wab66n9kmj71mrvl50v8rzr";
 
-  preBuild = ''	
-  buildFlagsArray+=("-ldflags" "-X github.com/hashicorp/consul/version.GitDescribe=v${version} -X github.com/hashicorp/consul/version.Version=${version} -X github.com/hashicorp/consul/version.VersionPrerelease=")	
+  preBuild = ''
+    buildFlagsArray+=("-ldflags"
+                      "-X github.com/hashicorp/consul/version.GitDescribe=v${version}
+                       -X github.com/hashicorp/consul/version.Version=${version}
+                       -X github.com/hashicorp/consul/version.VersionPrerelease=")
   '';
 
   meta = with stdenv.lib; {