diff options
author | Felix Buehler <account@buehler.rocks> | 2021-11-29 19:24:13 +0100 |
---|---|---|
committer | Felix Buehler <account@buehler.rocks> | 2021-11-30 21:11:29 +0100 |
commit | 22dffe27f394427505d1c9006dcb6aebc6b9f85b (patch) | |
tree | 6a83be474c2b7aa0d3fa41cb572df841da3ea0c7 /pkgs/tools/networking | |
parent | 4f6849f7c416bcaf48b349a33890d67713838ec1 (diff) |
pkgs/tools: use pname&version instead of name
Diffstat (limited to 'pkgs/tools/networking')
-rw-r--r-- | pkgs/tools/networking/atinout/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/networking/bacnet-stack/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/networking/netboot/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/networking/ngrok-2/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/networking/prettyping/default.nix | 5 | ||||
-rw-r--r-- | pkgs/tools/networking/redsocks/default.nix | 9 | ||||
-rw-r--r-- | pkgs/tools/networking/rp-pppoe/default.nix | 8 | ||||
-rw-r--r-- | pkgs/tools/networking/tdns-cli/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/networking/toxvpn/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/networking/waitron/default.nix | 4 |
10 files changed, 20 insertions, 24 deletions
diff --git a/pkgs/tools/networking/atinout/default.nix b/pkgs/tools/networking/atinout/default.nix index 93535531d91bd..6fad1174bbf07 100644 --- a/pkgs/tools/networking/atinout/default.nix +++ b/pkgs/tools/networking/atinout/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchgit, ronn, mount }: stdenv.mkDerivation rec { - name = "atinout-${version}"; + pname = "atinout"; version = "0.9.2-alpha"; NIX_CFLAGS_COMPILE = lib.optionalString (!stdenv.cc.isClang) "-Werror=implicit-fallthrough=0"; diff --git a/pkgs/tools/networking/bacnet-stack/default.nix b/pkgs/tools/networking/bacnet-stack/default.nix index a4f2ef36360eb..9e47993df6029 100644 --- a/pkgs/tools/networking/bacnet-stack/default.nix +++ b/pkgs/tools/networking/bacnet-stack/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "bacnet-stack"; + pname = "bacnet-stack"; version = "1.0.0"; src = fetchFromGitHub { diff --git a/pkgs/tools/networking/netboot/default.nix b/pkgs/tools/networking/netboot/default.nix index fdd1857ef10e4..cfd768e40ab6a 100644 --- a/pkgs/tools/networking/netboot/default.nix +++ b/pkgs/tools/networking/netboot/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, bison, lzo, db4 }: stdenv.mkDerivation rec { - name = "netboot"; + pname = "netboot"; version = "0.10.2"; src = fetchurl { diff --git a/pkgs/tools/networking/ngrok-2/default.nix b/pkgs/tools/networking/ngrok-2/default.nix index f1f8545c96de4..5366a2c3a9c66 100644 --- a/pkgs/tools/networking/ngrok-2/default.nix +++ b/pkgs/tools/networking/ngrok-2/default.nix @@ -16,8 +16,8 @@ let versions = lib.importJSON ./versions.json; in stdenv.mkDerivation { - name = "ngrok-${version}"; - version = version; + pname = "ngrok"; + inherit version; # run ./update src = fetchurl { inherit sha256 url; }; diff --git a/pkgs/tools/networking/prettyping/default.nix b/pkgs/tools/networking/prettyping/default.nix index 43f32ddb9fb41..16311f5b99612 100644 --- a/pkgs/tools/networking/prettyping/default.nix +++ b/pkgs/tools/networking/prettyping/default.nix @@ -1,12 +1,11 @@ { stdenv, lib, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "${program}-${version}"; - program = "prettyping"; + pname = "prettyping"; version = "1.0.1"; src = fetchFromGitHub { owner = "denilsonsa"; - repo = program; + repo = pname; rev = "v${version}"; sha256 = "05vfaq9y52z40245j47yjk1xaiwrazv15sgjq64w91dfyahjffxf"; }; diff --git a/pkgs/tools/networking/redsocks/default.nix b/pkgs/tools/networking/redsocks/default.nix index b609cce90bc54..9b8989f30c2ac 100644 --- a/pkgs/tools/networking/redsocks/default.nix +++ b/pkgs/tools/networking/redsocks/default.nix @@ -1,15 +1,12 @@ { lib, stdenv, fetchFromGitHub, libevent }: -let - pkg = "redsocks"; +stdenv.mkDerivation rec { + pname = "redsocks"; version = "0.5"; -in -stdenv.mkDerivation { - name = "${pkg}-${version}"; src = fetchFromGitHub { owner = "darkk"; - repo = pkg; + repo = "redsocks"; rev = "release-${version}"; sha256 = "170cpvvivb6y2kwsqj9ppx5brgds9gkn8mixrnvj8z9c15xhvplm"; }; diff --git a/pkgs/tools/networking/rp-pppoe/default.nix b/pkgs/tools/networking/rp-pppoe/default.nix index fd3a563c209d8..572625651e9ab 100644 --- a/pkgs/tools/networking/rp-pppoe/default.nix +++ b/pkgs/tools/networking/rp-pppoe/default.nix @@ -1,9 +1,10 @@ { lib, stdenv, fetchurl, ppp } : let - version = "3.12"; in -stdenv.mkDerivation { - name = "rp-pppoe-" + version; +stdenv.mkDerivation rec { + pname = "rp-pppoe"; + version = "3.12"; + src = fetchurl { url = "https://www.roaringpenguin.com/files/download/rp-pppoe-${version}.tar.gz"; sha256 = "1hl6rjvplapgsyrap8xj46kc9kqwdlm6ya6gp3lv0ihm0c24wy80"; @@ -11,7 +12,6 @@ stdenv.mkDerivation { buildInputs = [ ppp ]; - preConfigure = '' cd src export PPPD=${ppp}/sbin/pppd diff --git a/pkgs/tools/networking/tdns-cli/default.nix b/pkgs/tools/networking/tdns-cli/default.nix index 9f1ac89ce8ec5..a38456bcc760a 100644 --- a/pkgs/tools/networking/tdns-cli/default.nix +++ b/pkgs/tools/networking/tdns-cli/default.nix @@ -1,17 +1,17 @@ { lib, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { - name = "tdns-cli"; + pname = "tdns-cli"; version = "0.0.5"; src = fetchFromGitHub { owner = "rotty"; - repo = name; + repo = pname; rev = "v${version}"; sha256 = "0nn036in5j1h0vxkwif0lf7fn900zy4f4kxlzy6qdx3jakgmxvwh"; }; - cargoSha256 = "14mmfj5my8gbsdhlhz17w8wjcc085c6dkj78kwr2hhsbcxp1vjgg"; + cargoSha256 = "sha256-O4n38dla2WgZ4949Ata6AYbZF9LMnXDyuFNoXRrTN7I="; meta = with lib; { description = "DNS tool that aims to replace dig and nsupdate"; diff --git a/pkgs/tools/networking/toxvpn/default.nix b/pkgs/tools/networking/toxvpn/default.nix index c5aaec66d9e32..57a5510bd4306 100644 --- a/pkgs/tools/networking/toxvpn/default.nix +++ b/pkgs/tools/networking/toxvpn/default.nix @@ -11,7 +11,7 @@ }: stdenv.mkDerivation { - name = "toxvpn"; + pname = "toxvpn"; version = "unstable-2019-09-09"; src = fetchFromGitHub { diff --git a/pkgs/tools/networking/waitron/default.nix b/pkgs/tools/networking/waitron/default.nix index 8364cd5763dc1..c37d82024fe6b 100644 --- a/pkgs/tools/networking/waitron/default.nix +++ b/pkgs/tools/networking/waitron/default.nix @@ -2,8 +2,8 @@ { lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: buildGoPackage rec { - name = "waitron-unstable-${version}"; - version = "2020-01-24"; + pname = "waitron"; + version = "unstable-2020-01-24"; rev = "c96833619cbb0cf2bc71b1d7b534101e139cc6e6"; goPackagePath = "github.com/ns1/waitron"; |