From e531f92b249fe2c58b8c94717c566c8bc837ca41 Mon Sep 17 00:00:00 2001
From: Bob van der Linden <bobvanderlinden@gmail.com>
Date: Sun, 27 Aug 2017 23:26:14 +0200
Subject: [PATCH] ngrok: use proper attribute names

---
 pkgs/tools/networking/{ngrok1 => ngrok-1}/default.nix | 2 +-
 pkgs/tools/networking/{ngrok1 => ngrok-1}/deps.nix    | 0
 pkgs/tools/networking/{ngrok => ngrok-2}/default.nix  | 0
 pkgs/top-level/all-packages.nix                       | 6 +++---
 4 files changed, 4 insertions(+), 4 deletions(-)
 rename pkgs/tools/networking/{ngrok1 => ngrok-1}/default.nix (95%)
 rename pkgs/tools/networking/{ngrok1 => ngrok-1}/deps.nix (100%)
 rename pkgs/tools/networking/{ngrok => ngrok-2}/default.nix (100%)

diff --git a/pkgs/tools/networking/ngrok1/default.nix b/pkgs/tools/networking/ngrok-1/default.nix
similarity index 95%
rename from pkgs/tools/networking/ngrok1/default.nix
rename to pkgs/tools/networking/ngrok-1/default.nix
index 32fe8db45e4..e354ad223b8 100644
--- a/pkgs/tools/networking/ngrok1/default.nix
+++ b/pkgs/tools/networking/ngrok-1/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, pkgconfig, buildGoPackage, go-bindata, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "ngrok1-${version}";
+  name = "ngrok-${version}";
   version = "1.7.1";
   rev = "${version}";
 
diff --git a/pkgs/tools/networking/ngrok1/deps.nix b/pkgs/tools/networking/ngrok-1/deps.nix
similarity index 100%
rename from pkgs/tools/networking/ngrok1/deps.nix
rename to pkgs/tools/networking/ngrok-1/deps.nix
diff --git a/pkgs/tools/networking/ngrok/default.nix b/pkgs/tools/networking/ngrok-2/default.nix
similarity index 100%
rename from pkgs/tools/networking/ngrok/default.nix
rename to pkgs/tools/networking/ngrok-2/default.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a9a575e1e3e..dddbdd7174b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3418,11 +3418,11 @@ with pkgs;
 
   ngrep = callPackage ../tools/networking/ngrep { };
 
-  ngrok = ngrok2;
+  ngrok = ngrok-2;
 
-  ngrok2 = callPackage ../tools/networking/ngrok { };
+  ngrok-2 = callPackage ../tools/networking/ngrok-2 { };
 
-  ngrok1 = callPackage ../tools/networking/ngrok1 { };
+  ngrok-1 = callPackage ../tools/networking/ngrok-1 { };
 
   noice = callPackage ../applications/misc/noice { };