diff options
| author | Bob van der Linden <bobvanderlinden@gmail.com> | 2017-08-27 23:26:14 +0200 |
|---|---|---|
| committer | Domen Kožar <domen@enlambda.com> | 2017-08-27 23:53:42 +0100 |
| commit | e531f92b249fe2c58b8c94717c566c8bc837ca41 (patch) | |
| tree | b2766359fe5a7ef328711e65423e365f0ac0fadb | |
| parent | db59381a5d1781dcb3e72814caff408b194c5aac (diff) | |
| download | nixpkgs-e531f92b249fe2c58b8c94717c566c8bc837ca41.tar nixpkgs-e531f92b249fe2c58b8c94717c566c8bc837ca41.tar.gz nixpkgs-e531f92b249fe2c58b8c94717c566c8bc837ca41.tar.bz2 nixpkgs-e531f92b249fe2c58b8c94717c566c8bc837ca41.tar.lz nixpkgs-e531f92b249fe2c58b8c94717c566c8bc837ca41.tar.xz nixpkgs-e531f92b249fe2c58b8c94717c566c8bc837ca41.tar.zst nixpkgs-e531f92b249fe2c58b8c94717c566c8bc837ca41.zip | |
ngrok: use proper attribute names
| -rw-r--r-- | pkgs/tools/networking/ngrok-1/default.nix (renamed from pkgs/tools/networking/ngrok1/default.nix) | 2 | ||||
| -rw-r--r-- | pkgs/tools/networking/ngrok-1/deps.nix (renamed from pkgs/tools/networking/ngrok1/deps.nix) | 0 | ||||
| -rw-r--r-- | pkgs/tools/networking/ngrok-2/default.nix (renamed from pkgs/tools/networking/ngrok/default.nix) | 0 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 6 |
4 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/tools/networking/ngrok1/default.nix b/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 index 1db3c3e6519..1db3c3e6519 100644 --- a/pkgs/tools/networking/ngrok1/deps.nix +++ b/pkgs/tools/networking/ngrok-1/deps.nix diff --git a/pkgs/tools/networking/ngrok/default.nix b/pkgs/tools/networking/ngrok-2/default.nix index 031161da4d5..031161da4d5 100644 --- a/pkgs/tools/networking/ngrok/default.nix +++ b/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 { }; |