diff options
author | volth <volth@volth.com> | 2019-08-31 11:41:23 +0000 |
---|---|---|
committer | Samuel Leathers <disasm@gmail.com> | 2019-08-31 07:41:22 -0400 |
commit | 7bb6b373ab163639386f6a8a8f710790226c49af (patch) | |
tree | 8182a64a14991ef398aafd7985811edfedd13ad7 /pkgs/applications | |
parent | 01c4c15ef55845de1052ed915b4f05b7b7059a75 (diff) |
treewide: name -> pname (#67513)
Diffstat (limited to 'pkgs/applications')
30 files changed, 35 insertions, 37 deletions
diff --git a/pkgs/applications/blockchains/ethabi.nix b/pkgs/applications/blockchains/ethabi.nix index 21d69f14d7f3f..5bc81a6daf66a 100644 --- a/pkgs/applications/blockchains/ethabi.nix +++ b/pkgs/applications/blockchains/ethabi.nix @@ -3,7 +3,7 @@ with rustPlatform; buildRustPackage rec { - name = "ethabi-${version}"; + pname = "ethabi"; version = "7.0.0"; src = fetchFromGitHub { diff --git a/pkgs/applications/blockchains/polkadot/default.nix b/pkgs/applications/blockchains/polkadot/default.nix index 26c9192ee6fad..100c0f8ba41f7 100644 --- a/pkgs/applications/blockchains/polkadot/default.nix +++ b/pkgs/applications/blockchains/polkadot/default.nix @@ -6,7 +6,7 @@ }: rustPlatform.buildRustPackage rec { - name = "polkadot-${version}"; + pname = "polkadot"; version = "0.2.17"; src = fetchFromGitHub { diff --git a/pkgs/applications/blockchains/zcash/librustzcash/default.nix b/pkgs/applications/blockchains/zcash/librustzcash/default.nix index 3aeee7e6972f7..634d4e8538a15 100644 --- a/pkgs/applications/blockchains/zcash/librustzcash/default.nix +++ b/pkgs/applications/blockchains/zcash/librustzcash/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { - name = "librustzcash-unstable-${version}"; + pname = "librustzcash-unstable"; version = "2017-03-17"; src = fetchFromGitHub { diff --git a/pkgs/applications/gis/whitebox-tools/default.nix b/pkgs/applications/gis/whitebox-tools/default.nix index d82bdc6654980..4c7f9cde5ce79 100644 --- a/pkgs/applications/gis/whitebox-tools/default.nix +++ b/pkgs/applications/gis/whitebox-tools/default.nix @@ -1,6 +1,6 @@ { stdenv, rustPlatform , fetchFromGitHub, Security }: rustPlatform.buildRustPackage rec { - name = "whitebox_tools-${version}"; + pname = "whitebox_tools"; version = "0.9.0"; src = fetchFromGitHub { diff --git a/pkgs/applications/misc/electrum/dash.nix b/pkgs/applications/misc/electrum/dash.nix index 98ed10b0c7ccf..8ba562de1cb7c 100644 --- a/pkgs/applications/misc/electrum/dash.nix +++ b/pkgs/applications/misc/electrum/dash.nix @@ -2,7 +2,7 @@ python2Packages.buildPythonApplication rec { version = "2.9.3.1"; - name = "electrum-dash-${version}"; + pname = "electrum-dash"; src = fetchurl { url = "https://github.com/akhavr/electrum-dash/releases/download/${version}/Electrum-DASH-${version}.tar.gz"; diff --git a/pkgs/applications/misc/moolticute/default.nix b/pkgs/applications/misc/moolticute/default.nix index 0f4e72502bbaf..e734e44a2e046 100644 --- a/pkgs/applications/misc/moolticute/default.nix +++ b/pkgs/applications/misc/moolticute/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "moolticute-${version}"; + pname = "moolticute"; version = "0.30.8"; src = fetchurl { diff --git a/pkgs/applications/misc/todiff/default.nix b/pkgs/applications/misc/todiff/default.nix index 5bb2b5b946169..93f233a4f9252 100644 --- a/pkgs/applications/misc/todiff/default.nix +++ b/pkgs/applications/misc/todiff/default.nix @@ -1,7 +1,7 @@ { stdenv, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { - name = "todiff-${version}"; + pname = "todiff"; version = "0.6.1"; src = fetchFromGitHub { diff --git a/pkgs/applications/networking/cluster/click/default.nix b/pkgs/applications/networking/cluster/click/default.nix index bd8eb5451526a..f4d6fce3545e3 100644 --- a/pkgs/applications/networking/cluster/click/default.nix +++ b/pkgs/applications/networking/cluster/click/default.nix @@ -3,7 +3,7 @@ with rustPlatform; buildRustPackage rec { - name = "click-${version}"; + pname = "click"; version = "0.4.2"; src = fetchFromGitHub { diff --git a/pkgs/applications/networking/cluster/habitat/default.nix b/pkgs/applications/networking/cluster/habitat/default.nix index 0c210dcc535b7..9bf801ee93d72 100644 --- a/pkgs/applications/networking/cluster/habitat/default.nix +++ b/pkgs/applications/networking/cluster/habitat/default.nix @@ -4,7 +4,7 @@ with rustPlatform; buildRustPackage rec { - name = "habitat-${version}"; + pname = "habitat"; version = "0.30.2"; src = fetchFromGitHub { diff --git a/pkgs/applications/networking/dyndns/cfdyndns/default.nix b/pkgs/applications/networking/dyndns/cfdyndns/default.nix index a5b4c577b4cb1..640421bef8f5d 100644 --- a/pkgs/applications/networking/dyndns/cfdyndns/default.nix +++ b/pkgs/applications/networking/dyndns/cfdyndns/default.nix @@ -3,7 +3,7 @@ with rustPlatform; buildRustPackage rec { - name = "cfdyndns-${version}"; + pname = "cfdyndns"; version = "0.0.1"; src = fetchFromGitHub { owner = "colemickens"; diff --git a/pkgs/applications/networking/feedreaders/newsboat/default.nix b/pkgs/applications/networking/feedreaders/newsboat/default.nix index 2795ac4e46e40..f7a9521c9937b 100644 --- a/pkgs/applications/networking/feedreaders/newsboat/default.nix +++ b/pkgs/applications/networking/feedreaders/newsboat/default.nix @@ -2,11 +2,11 @@ , asciidoc, docbook_xml_dtd_45, libxslt, docbook_xsl, libiconv, Security, makeWrapper }: rustPlatform.buildRustPackage rec { - name = "newsboat-${version}"; + pname = "newsboat"; version = "2.16.1"; src = fetchurl { - url = "https://newsboat.org/releases/${version}/${name}.tar.xz"; + url = "https://newsboat.org/releases/${version}/${pname}-${version}.tar.xz"; sha256 = "0lxdsfcwa4byhfnn0gv34w3rr531f4nfqgi8j4qqmh3gncbwh8s0"; }; diff --git a/pkgs/applications/networking/feedreaders/rawdog/default.nix b/pkgs/applications/networking/feedreaders/rawdog/default.nix index 6bdaf2ffaf48a..7304fd2f654be 100644 --- a/pkgs/applications/networking/feedreaders/rawdog/default.nix +++ b/pkgs/applications/networking/feedreaders/rawdog/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, python2Packages }: python2Packages.buildPythonApplication rec { - name = "rawdog-${version}"; + pname = "rawdog"; version = "2.23"; src = fetchurl { - url = "https://offog.org/files/${name}.tar.gz"; + url = "https://offog.org/files/${pname}-${version}.tar.gz"; sha256 = "18nyg19mwxyqdnykplkqmzb4n27vvrhvp639zai8f81gg9vdbsjp"; }; diff --git a/pkgs/applications/networking/mailreaders/mailpile/default.nix b/pkgs/applications/networking/mailreaders/mailpile/default.nix index 0f11d9a6df05a..b37e0b00ce76f 100644 --- a/pkgs/applications/networking/mailreaders/mailpile/default.nix +++ b/pkgs/applications/networking/mailreaders/mailpile/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, python2Packages, gnupg1orig, openssl, git }: python2Packages.buildPythonApplication rec { - name = "mailpile-${version}"; + pname = "mailpile"; version = "1.0.0rc2"; src = fetchFromGitHub { diff --git a/pkgs/applications/science/logic/elan/default.nix b/pkgs/applications/science/logic/elan/default.nix index bc4f526bb3a4a..f9a911d821083 100644 --- a/pkgs/applications/science/logic/elan/default.nix +++ b/pkgs/applications/science/logic/elan/default.nix @@ -1,7 +1,7 @@ { stdenv, pkgconfig, curl, openssl, zlib, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { - name = "elan-${version}"; + pname = "elan"; version = "0.7.5"; cargoSha256 = "0lc320m3vw76d6pa5wp6c9jblac6lmyf9qqnxmsnkn4ixdhnghsd"; diff --git a/pkgs/applications/science/machine-learning/labelimg/default.nix b/pkgs/applications/science/machine-learning/labelimg/default.nix index 340073b016e32..4469e7f06e03b 100644 --- a/pkgs/applications/science/machine-learning/labelimg/default.nix +++ b/pkgs/applications/science/machine-learning/labelimg/default.nix @@ -1,6 +1,6 @@ { stdenv, python2Packages, fetchurl }: python2Packages.buildPythonApplication rec { - name = "labelImg-${version}"; + pname = "labelImg"; version = "1.6.0"; src = fetchurl { url = "https://github.com/tzutalin/labelImg/archive/v${version}.tar.gz"; diff --git a/pkgs/applications/science/misc/rink/default.nix b/pkgs/applications/science/misc/rink/default.nix index daa8b4943227d..0dfcbfda00245 100644 --- a/pkgs/applications/science/misc/rink/default.nix +++ b/pkgs/applications/science/misc/rink/default.nix @@ -2,7 +2,7 @@ rustPlatform.buildRustPackage rec { version = "0.4.4"; - name = "rink-${version}"; + pname = "rink"; src = fetchFromGitHub { owner = "tiffany352"; diff --git a/pkgs/applications/version-management/bazaar/tools.nix b/pkgs/applications/version-management/bazaar/tools.nix index d16ea27105038..0dfa19882028b 100644 --- a/pkgs/applications/version-management/bazaar/tools.nix +++ b/pkgs/applications/version-management/bazaar/tools.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, python2Packages }: python2Packages.buildPythonApplication rec { - name = "bzr-tools-${version}"; + pname = "bzr-tools"; version = "2.6.0"; src = fetchurl { diff --git a/pkgs/applications/version-management/cvs2svn/default.nix b/pkgs/applications/version-management/cvs2svn/default.nix index a2ebb8195db48..4c818060d2204 100644 --- a/pkgs/applications/version-management/cvs2svn/default.nix +++ b/pkgs/applications/version-management/cvs2svn/default.nix @@ -4,11 +4,11 @@ }: python2Packages.buildPythonApplication rec { - name = "cvs2svn-${version}"; + pname = "cvs2svn"; version = "2.5.0"; src = fetchurl { - url = "http://cvs2svn.tigris.org/files/documents/1462/49543/${name}.tar.gz"; + url = "http://cvs2svn.tigris.org/files/documents/1462/49543/${pname}-${version}.tar.gz"; sha256 = "1ska0z15sjhyfi860rjazz9ya1gxbf5c0h8dfqwz88h7fccd22b4"; }; diff --git a/pkgs/applications/version-management/git-and-tools/git-big-picture/default.nix b/pkgs/applications/version-management/git-and-tools/git-big-picture/default.nix index 2d171df8bf240..32b9c8a980dcd 100644 --- a/pkgs/applications/version-management/git-and-tools/git-big-picture/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-big-picture/default.nix @@ -4,8 +4,6 @@ python2Packages.buildPythonApplication rec { pname = "git-big-picture"; version = "0.10.1"; - name = "${pname}-${version}"; - src = fetchFromGitHub { owner = "esc"; repo = pname; diff --git a/pkgs/applications/version-management/git-and-tools/git-codeowners/default.nix b/pkgs/applications/version-management/git-and-tools/git-codeowners/default.nix index fbbb2d9524222..418cf2e5866f0 100644 --- a/pkgs/applications/version-management/git-and-tools/git-codeowners/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-codeowners/default.nix @@ -1,6 +1,6 @@ { lib, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { - name = "git-codeowners-${version}"; + pname = "git-codeowners"; version = "0.1.2"; src = fetchFromGitHub { diff --git a/pkgs/applications/version-management/git-and-tools/git-dit/default.nix b/pkgs/applications/version-management/git-and-tools/git-dit/default.nix index 90b8b54434bdc..77fc04281153e 100644 --- a/pkgs/applications/version-management/git-and-tools/git-dit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-dit/default.nix @@ -16,7 +16,7 @@ with rustPlatform; buildRustPackage rec { - name = "git-dit-${version}"; + pname = "git-dit"; version = "0.4.0"; src = fetchFromGitHub { diff --git a/pkgs/applications/version-management/git-up/default.nix b/pkgs/applications/version-management/git-up/default.nix index 45c97868c4bf8..ba0625c433de9 100644 --- a/pkgs/applications/version-management/git-up/default.nix +++ b/pkgs/applications/version-management/git-up/default.nix @@ -2,10 +2,10 @@ python2Packages.buildPythonApplication rec { version = "1.4.2"; - name = "git-up-${version}"; + pname = "git-up"; src = fetchurl { - url = "mirror://pypi/g/git-up/${name}.zip"; + url = "mirror://pypi/g/git-up/${pname}-${version}.zip"; sha256 = "121ia5gyjy7js6fbsx9z98j2qpq7rzwpsj8gnfvsbz2d69g0vl7q"; }; diff --git a/pkgs/applications/version-management/gitinspector/default.nix b/pkgs/applications/version-management/gitinspector/default.nix index 2428c6cebddd3..4467e9746ce9e 100644 --- a/pkgs/applications/version-management/gitinspector/default.nix +++ b/pkgs/applications/version-management/gitinspector/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchzip, python2Packages}: python2Packages.buildPythonApplication rec { - name = "gitinspector-${version}"; + pname = "gitinspector"; version = "0.4.4"; namePrefix = ""; src = fetchzip { url = "https://github.com/ejwa/gitinspector/archive/v${version}.tar.gz"; sha256 = "1pfsw6xldm6jigs3nhysvqaxk8a0zf8zczgfkrp920as9sya3c7m"; - name = name + "-src"; + name = "${pname}-${version}" + "-src"; }; checkInputs = with python2Packages; [ diff --git a/pkgs/applications/version-management/pijul/default.nix b/pkgs/applications/version-management/pijul/default.nix index 180664d338636..6d0e39d47bf4c 100644 --- a/pkgs/applications/version-management/pijul/default.nix +++ b/pkgs/applications/version-management/pijul/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, rustPlatform, darwin, openssl, libsodium, nettle, clang, libclang, pkgconfig }: rustPlatform.buildRustPackage rec { - name = "pijul-${version}"; + pname = "pijul"; version = "0.12.0"; src = fetchurl { - url = "https://pijul.org/releases/${name}.tar.gz"; + url = "https://pijul.org/releases/${pname}-${version}.tar.gz"; sha256 = "1rm787kkh3ya8ix0rjvj7sbrg9armm0rnpkga6gjmsbg5bx20y4q"; }; diff --git a/pkgs/applications/version-management/rabbitvcs/default.nix b/pkgs/applications/version-management/rabbitvcs/default.nix index d3b027fada68b..e9950c32549a4 100644 --- a/pkgs/applications/version-management/rabbitvcs/default.nix +++ b/pkgs/applications/version-management/rabbitvcs/default.nix @@ -1,6 +1,6 @@ { fetchFromGitHub, lib, python2Packages, meld, subversion, gvfs, xdg_utils }: python2Packages.buildPythonApplication rec { - name = "rabbitvcs-${version}"; + pname = "rabbitvcs"; version = "0.17.1"; namePrefix = ""; diff --git a/pkgs/applications/version-management/sit/default.nix b/pkgs/applications/version-management/sit/default.nix index 7d655bfc5d3be..a225c23ceebcc 100644 --- a/pkgs/applications/version-management/sit/default.nix +++ b/pkgs/applications/version-management/sit/default.nix @@ -3,7 +3,7 @@ libiconv, CoreFoundation, Security }: rustPlatform.buildRustPackage rec { - name = "sit-${version}"; + pname = "sit"; version = "0.4.1"; src = fetchFromGitHub { diff --git a/pkgs/applications/version-management/tailor/default.nix b/pkgs/applications/version-management/tailor/default.nix index c68cc928848dd..c769ec0a66d6e 100644 --- a/pkgs/applications/version-management/tailor/default.nix +++ b/pkgs/applications/version-management/tailor/default.nix @@ -1,7 +1,7 @@ { fetchurl, python2Packages }: python2Packages.buildPythonApplication rec { - name = "tailor-${version}"; + pname = "tailor"; version = "0.9.35"; src = fetchurl { diff --git a/pkgs/applications/virtualization/cntr/default.nix b/pkgs/applications/virtualization/cntr/default.nix index 23084c6286a4f..13afe0a426195 100644 --- a/pkgs/applications/virtualization/cntr/default.nix +++ b/pkgs/applications/virtualization/cntr/default.nix @@ -1,7 +1,7 @@ { stdenv, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { - name = "cntr-${version}"; + pname = "cntr"; version = "1.2.0"; src = fetchFromGitHub { diff --git a/pkgs/applications/virtualization/railcar/default.nix b/pkgs/applications/virtualization/railcar/default.nix index 0a139448cb3ab..bce2540614213 100644 --- a/pkgs/applications/virtualization/railcar/default.nix +++ b/pkgs/applications/virtualization/railcar/default.nix @@ -1,7 +1,7 @@ { lib, fetchFromGitHub, rustPlatform, libseccomp }: rustPlatform.buildRustPackage rec { - name = "railcar-${version}"; + pname = "railcar"; version = "1.0.4"; src = fetchFromGitHub { diff --git a/pkgs/applications/window-managers/dwm/dwm-status.nix b/pkgs/applications/window-managers/dwm/dwm-status.nix index eac15ca714189..1787e40eb96c7 100644 --- a/pkgs/applications/window-managers/dwm/dwm-status.nix +++ b/pkgs/applications/window-managers/dwm/dwm-status.nix @@ -8,7 +8,7 @@ let in rustPlatform.buildRustPackage rec { - name = "dwm-status-${version}"; + pname = "dwm-status"; version = "1.6.2"; src = fetchFromGitHub { |