diff options
| author | Matthew Justin Bauer <mjbauer95@gmail.com> | 2018-05-28 13:58:17 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-28 13:58:17 -0400 |
| commit | 6cc070df8ab0fa31d9ecfe32f386f5a784db7214 (patch) | |
| tree | a1a7dba4d7cae86a0815f10de8e7a9b825388de5 /pkgs/tools/networking | |
| parent | 62b89d768f38d784755d82de6ce6814b3b4ae374 (diff) | |
| parent | af9d10a91b5ef0518ee12b220470735076974210 (diff) | |
| download | nixlib-6cc070df8ab0fa31d9ecfe32f386f5a784db7214.tar nixlib-6cc070df8ab0fa31d9ecfe32f386f5a784db7214.tar.gz nixlib-6cc070df8ab0fa31d9ecfe32f386f5a784db7214.tar.bz2 nixlib-6cc070df8ab0fa31d9ecfe32f386f5a784db7214.tar.lz nixlib-6cc070df8ab0fa31d9ecfe32f386f5a784db7214.tar.xz nixlib-6cc070df8ab0fa31d9ecfe32f386f5a784db7214.tar.zst nixlib-6cc070df8ab0fa31d9ecfe32f386f5a784db7214.zip | |
Merge pull request #41162 from ryantm/name-format
treewide: fix derivation names
Diffstat (limited to 'pkgs/tools/networking')
| -rw-r--r-- | pkgs/tools/networking/http-prompt/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/tools/networking/ssldump/default.nix | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/tools/networking/http-prompt/default.nix b/pkgs/tools/networking/http-prompt/default.nix index 37f4f96a3172..7521a9a13bc2 100644 --- a/pkgs/tools/networking/http-prompt/default.nix +++ b/pkgs/tools/networking/http-prompt/default.nix @@ -1,8 +1,9 @@ { stdenv, fetchFromGitHub, pythonPackages, httpie }: pythonPackages.buildPythonApplication rec { + pname = "http-prompt"; version = "0.11.1"; - name = "http-prompt"; + name = "${pname}-${version}"; src = fetchFromGitHub { rev = "v${version}"; @@ -21,7 +22,7 @@ pythonPackages.buildPythonApplication rec { ]; checkPhase = '' - $out/bin/${name} --version | grep -q "${version}" + $out/bin/${pname} --version | grep -q "${version}" ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/networking/ssldump/default.nix b/pkgs/tools/networking/ssldump/default.nix index dcc78560fa36..adda38c184d9 100644 --- a/pkgs/tools/networking/ssldump/default.nix +++ b/pkgs/tools/networking/ssldump/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, openssl, libpcap }: stdenv.mkDerivation rec { - name = "ssldump"; + name = "ssldump-${version}"; version = "0.9b3"; src = fetchFromGitHub { |