From 21c0cc1eeefa7834e13787d248c37331fb18b55c Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Mon, 28 Oct 2019 16:24:23 -0500
Subject: [PATCH] nats-server: rename (from gnatsd), 1.4.0 -> 2.1.0

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/servers/{gnatsd => nats-server}/default.nix | 15 +++++++--------
 pkgs/top-level/aliases.nix                       |  6 +++++-
 pkgs/top-level/all-packages.nix                  |  2 +-
 3 files changed, 13 insertions(+), 10 deletions(-)
 rename pkgs/servers/{gnatsd => nats-server}/default.nix (57%)

diff --git a/pkgs/servers/gnatsd/default.nix b/pkgs/servers/nats-server/default.nix
similarity index 57%
rename from pkgs/servers/gnatsd/default.nix
rename to pkgs/servers/nats-server/default.nix
index 1bb2ebc4f868..7f75579b51c6 100644
--- a/pkgs/servers/gnatsd/default.nix
+++ b/pkgs/servers/nats-server/default.nix
@@ -3,17 +3,16 @@
 with lib;
 
 buildGoPackage rec {
-  pname = "gnatsd";
-  version = "1.4.0";
-  rev = "v${version}";
+  pname   = "nats-server";
+  version = "2.1.0";
 
-  goPackagePath = "github.com/nats-io/gnatsd";
+  goPackagePath = "github.com/nats-io/${pname}";
 
   src = fetchFromGitHub {
-    inherit rev;
-    owner = "nats-io";
-    repo = "gnatsd";
-    sha256 = "0wxdvaxl273kd3wcas634hx1wx5piljgbfr6vhf669b1frkgrh2b";
+    rev    = "v${version}";
+    owner  = "nats-io";
+    repo   = pname;
+    sha256 = "1zp43v69cawbp6bpby1vx51z6nyv8gxnnl2qkhwr9zrgnhlcflnl";
   };
 
   meta = {
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 5b455d629143..02f2d18ad359 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -463,4 +463,8 @@ mapAliases ({
   ocaml_4_01_0 = ocamlPackages_4_01_0.ocaml;
   ocaml_4_02   = ocamlPackages_4_02.ocaml;
   ocaml_4_03   = ocamlPackages_4_03.ocaml;
-}))
+}) // {
+
+  # added 2019-10-28
+  gnatsd = nats-server;
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4d4965fbb7af..f2a80fdc0b64 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14854,7 +14854,7 @@ in
 
   glabels = callPackage ../applications/graphics/glabels { };
 
-  gnatsd = callPackage ../servers/gnatsd { };
+  nats-server = callPackage ../servers/nats-server { };
 
   gofish = callPackage ../servers/gopher/gofish { };