From e1ea38626faa553d5cfadbf69f0766dadba2df00 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Sat, 6 Aug 2022 13:00:18 +1000
Subject: [PATCH] etcd_3_5: refactor

- use inherits and add passthru
---
 pkgs/servers/etcd/3.5.nix | 43 ++++++++++++++++-----------------------
 1 file changed, 18 insertions(+), 25 deletions(-)

diff --git a/pkgs/servers/etcd/3.5.nix b/pkgs/servers/etcd/3.5.nix
index ff07116e2bd2..3de8fef11888 100644
--- a/pkgs/servers/etcd/3.5.nix
+++ b/pkgs/servers/etcd/3.5.nix
@@ -1,15 +1,18 @@
 { lib, buildGoModule, fetchFromGitHub, symlinkJoin }:
 
 let
-  etcdVersion = "3.5.4";
-  etcdSrc = fetchFromGitHub {
+  version = "3.5.4";
+
+  src = fetchFromGitHub {
     owner = "etcd-io";
     repo = "etcd";
-    rev = "v${etcdVersion}";
+    rev = "v${version}";
     sha256 = "sha256-mTQHxLLfNiihvHg5zaTeVNWKuzvE0KBiJdY3qMJHMCM=";
   };
 
-  commonMeta = with lib; {
+  CGO_ENABLED = 0;
+
+  meta = with lib; {
     description = "Distributed reliable key-value store for the most critical data of a distributed system";
     license = licenses.asl20;
     homepage = "https://etcd.io/";
@@ -19,60 +22,50 @@ let
 
   etcdserver = buildGoModule rec {
     pname = "etcdserver";
-    version = etcdVersion;
+
+    inherit CGO_ENABLED meta src version;
 
     vendorSha256 = "sha256-4djUQvWp9hScua9l1ZTq298zWSeDYRDojEt2AWmarzw=";
 
-    src = etcdSrc;
     modRoot = "./server";
 
     postBuild = ''
       mv $GOPATH/bin/{server,etcd}
     '';
 
-    CGO_ENABLED = 0;
-
     # We set the GitSHA to `GitNotFound` to match official build scripts when
     # git is unavailable. This is to avoid doing a full Git Checkout of etcd.
     # User facing version numbers are still available in the binary, just not
     # the sha it was built from.
     ldflags = [ "-X go.etcd.io/etcd/api/v3/version.GitSHA=GitNotFound" ];
-
-    meta = commonMeta;
   };
 
   etcdutl = buildGoModule rec {
     pname = "etcdutl";
-    version = etcdVersion;
+
+    inherit CGO_ENABLED meta src version;
 
     vendorSha256 = "sha256-nk56XGpNsDwcGrTKithKGnPCX0NhpQmzNSXHk3vmdtg=";
 
-    src = etcdSrc;
     modRoot = "./etcdutl";
-
-    CGO_ENABLED = 0;
-
-    meta = commonMeta;
   };
 
   etcdctl = buildGoModule rec {
     pname = "etcdctl";
-    version = etcdVersion;
+
+    inherit CGO_ENABLED meta src version;
 
     vendorSha256 = "sha256-WIMYrXfay6DMz+S/tIc/X4ffMizxub8GS1DDgIR40D4=";
 
-    src = etcdSrc;
     modRoot = "./etcdctl";
-
-    CGO_ENABLED = 0;
-
-    meta = commonMeta;
   };
 in
 symlinkJoin {
-  name = "etcd";
-  version = etcdVersion;
-  meta = commonMeta;
+  name = "etcd-${version}";
+
+  inherit meta version;
+
+  passthru = { inherit etcdserver etcdutl etcdctl; };
 
   paths = [
     etcdserver