diff options
author | volth <volth@volth.com> | 2019-08-15 12:41:18 +0000 |
---|---|---|
committer | Jörg Thalheim <Mic92@users.noreply.github.com> | 2019-08-15 13:41:18 +0100 |
commit | 46420bbaa3f8f79ce7b9ee68e98eba1f7bce2db6 (patch) | |
tree | 46b871987347acf0215f8a9bf54df275aed9c496 /pkgs/tools/misc | |
parent | cff9e6429a4341e924594f5e057b03ca8101b314 (diff) | |
download | nixpkgs-46420bbaa3f8f79ce7b9ee68e98eba1f7bce2db6.tar nixpkgs-46420bbaa3f8f79ce7b9ee68e98eba1f7bce2db6.tar.gz nixpkgs-46420bbaa3f8f79ce7b9ee68e98eba1f7bce2db6.tar.bz2 nixpkgs-46420bbaa3f8f79ce7b9ee68e98eba1f7bce2db6.tar.lz nixpkgs-46420bbaa3f8f79ce7b9ee68e98eba1f7bce2db6.tar.xz nixpkgs-46420bbaa3f8f79ce7b9ee68e98eba1f7bce2db6.tar.zst nixpkgs-46420bbaa3f8f79ce7b9ee68e98eba1f7bce2db6.zip |
treewide: name -> pname (easy cases) (#66585)
treewide replacement of stdenv.mkDerivation rec { name = "*-${version}"; version = "*"; to pname
Diffstat (limited to 'pkgs/tools/misc')
255 files changed, 298 insertions, 308 deletions
diff --git a/pkgs/tools/misc/0x0/default.nix b/pkgs/tools/misc/0x0/default.nix index ad129503de3..a349a3f2fc0 100644 --- a/pkgs/tools/misc/0x0/default.nix +++ b/pkgs/tools/misc/0x0/default.nix @@ -1,7 +1,7 @@ { stdenv, xsel, curl, fetchFromGitLab, makeWrapper}: stdenv.mkDerivation rec { - name = "0x0-${version}"; + pname = "0x0"; version = "2018-06-24"; src = fetchFromGitLab { diff --git a/pkgs/tools/misc/aescrypt/default.nix b/pkgs/tools/misc/aescrypt/default.nix index 3c529f31f66..75d8d71b895 100644 --- a/pkgs/tools/misc/aescrypt/default.nix +++ b/pkgs/tools/misc/aescrypt/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "3.14"; - name = "aescrypt-${version}"; + pname = "aescrypt"; src = fetchurl { - url = "https://www.aescrypt.com/download/v3/linux/${name}.tgz"; + url = "https://www.aescrypt.com/download/v3/linux/${pname}-${version}.tgz"; sha256 = "1iziymcbpc64d44djgqfifpblsly4sr5bxsp5g29jgxz552kjlah"; }; diff --git a/pkgs/tools/misc/alarm-clock-applet/default.nix b/pkgs/tools/misc/alarm-clock-applet/default.nix index 8ee363ed91d..7b869d66d1c 100644 --- a/pkgs/tools/misc/alarm-clock-applet/default.nix +++ b/pkgs/tools/misc/alarm-clock-applet/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { version = "0.3.4"; - name = "alarm-clock-applet-${version}"; + pname = "alarm-clock-applet"; src = fetchFromGitHub { owner = "joh"; diff --git a/pkgs/tools/misc/antimicro/default.nix b/pkgs/tools/misc/antimicro/default.nix index 62d46bba5b0..6ff0c7cd0d7 100644 --- a/pkgs/tools/misc/antimicro/default.nix +++ b/pkgs/tools/misc/antimicro/default.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, cmake, pkgconfig, SDL2, qtbase, qttools, xorg, fetchFromGitHub }: mkDerivation rec { - name = "antimicro-${version}"; + pname = "antimicro"; version = "2.23"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/argtable/default.nix b/pkgs/tools/misc/argtable/default.nix index 6b1512e854b..8b2a2a4b215 100644 --- a/pkgs/tools/misc/argtable/default.nix +++ b/pkgs/tools/misc/argtable/default.nix @@ -2,7 +2,7 @@ , fetchgit }: stdenv.mkDerivation rec { - name = "argtable-${version}"; + pname = "argtable"; version = "3.0.1"; src = fetchgit { diff --git a/pkgs/tools/misc/arp-scan/default.nix b/pkgs/tools/misc/arp-scan/default.nix index dc51d04e4b5..4f50e0f556b 100644 --- a/pkgs/tools/misc/arp-scan/default.nix +++ b/pkgs/tools/misc/arp-scan/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, libpcap, makeWrapper, perlPackages }: stdenv.mkDerivation rec { - name = "arp-scan-${version}"; + pname = "arp-scan"; version = "1.9.5"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/aspcud/default.nix b/pkgs/tools/misc/aspcud/default.nix index 859112d29bc..b58f603ce59 100644 --- a/pkgs/tools/misc/aspcud/default.nix +++ b/pkgs/tools/misc/aspcud/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { version = "1.9.4"; - name = "aspcud-${version}"; + pname = "aspcud"; src = fetchzip { url = "https://github.com/potassco/aspcud/archive/v${version}.tar.gz"; diff --git a/pkgs/tools/misc/autojump/default.nix b/pkgs/tools/misc/autojump/default.nix index ca4dde7a450..8294e92d13f 100644 --- a/pkgs/tools/misc/autojump/default.nix +++ b/pkgs/tools/misc/autojump/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, python, bash }: stdenv.mkDerivation rec { - name = "autojump-${version}"; + pname = "autojump"; version = "22.5.3"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/automirror/default.nix b/pkgs/tools/misc/automirror/default.nix index 3fd52051357..3bfb2d656d9 100644 --- a/pkgs/tools/misc/automirror/default.nix +++ b/pkgs/tools/misc/automirror/default.nix @@ -1,7 +1,6 @@ {stdenv, fetchFromGitHub, git, ronn}: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "automirror"; version = "49"; diff --git a/pkgs/tools/misc/autorevision/default.nix b/pkgs/tools/misc/autorevision/default.nix index 75c7b258a44..ee07221b755 100644 --- a/pkgs/tools/misc/autorevision/default.nix +++ b/pkgs/tools/misc/autorevision/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "autorevision-${version}"; + pname = "autorevision"; version = "1.21"; src = fetchurl { diff --git a/pkgs/tools/misc/azure-vhd-utils/default.nix b/pkgs/tools/misc/azure-vhd-utils/default.nix index 5ead0e1020c..6f2afc888e8 100644 --- a/pkgs/tools/misc/azure-vhd-utils/default.nix +++ b/pkgs/tools/misc/azure-vhd-utils/default.nix @@ -2,7 +2,7 @@ { stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { - name = "azure-vhd-utils-${version}"; + pname = "azure-vhd-utils"; version = "20160614-${stdenv.lib.strings.substring 0 7 rev}"; rev = "070db2d701a462ca2edcf89d677ed3cac309d8e8"; diff --git a/pkgs/tools/misc/bandwidth/default.nix b/pkgs/tools/misc/bandwidth/default.nix index 4f90c0f03e9..3b5e72c89f7 100644 --- a/pkgs/tools/misc/bandwidth/default.nix +++ b/pkgs/tools/misc/bandwidth/default.nix @@ -10,11 +10,11 @@ let else throw "Unknown architecture"; in stdenv.mkDerivation rec { - name = "bandwidth-${version}"; + pname = "bandwidth"; version = "1.5.1"; src = fetchurl { - url = "https://zsmith.co/archives/${name}.tar.gz"; + url = "https://zsmith.co/archives/${pname}-${version}.tar.gz"; sha256 = "1v9k1a2ilkbhc3viyacgq88c9if60kwsd1fy6rn84317qap4i7ib"; }; diff --git a/pkgs/tools/misc/bbe/default.nix b/pkgs/tools/misc/bbe/default.nix index ecff2459ef2..b0af13160d2 100644 --- a/pkgs/tools/misc/bbe/default.nix +++ b/pkgs/tools/misc/bbe/default.nix @@ -1,6 +1,6 @@ { stdenv , fetchurl, autoreconfHook }: stdenv.mkDerivation rec { - name = "bbe-${version}"; + pname = "bbe"; version = "0.2.2"; src = fetchurl { diff --git a/pkgs/tools/misc/bibtex2html/default.nix b/pkgs/tools/misc/bibtex2html/default.nix index 89d68461431..c7a9af4abd1 100644 --- a/pkgs/tools/misc/bibtex2html/default.nix +++ b/pkgs/tools/misc/bibtex2html/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, ocaml }: stdenv.mkDerivation rec { - name = "bibtex2html-${version}"; + pname = "bibtex2html"; version = "1.99"; src = fetchurl { diff --git a/pkgs/tools/misc/bibtool/default.nix b/pkgs/tools/misc/bibtool/default.nix index 5e8a8c56b0a..7664b96563b 100644 --- a/pkgs/tools/misc/bibtool/default.nix +++ b/pkgs/tools/misc/bibtool/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, perl }: stdenv.mkDerivation rec { - name = "bibtool-${version}"; + pname = "bibtool"; version = "2.67"; src = fetchurl { diff --git a/pkgs/tools/misc/bibutils/default.nix b/pkgs/tools/misc/bibutils/default.nix index d7cca2a77bd..d84c6ebaabc 100644 --- a/pkgs/tools/misc/bibutils/default.nix +++ b/pkgs/tools/misc/bibutils/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "bibutils-${version}"; + pname = "bibutils"; version = "6.7"; src = fetchurl { diff --git a/pkgs/tools/misc/blink1-tool/default.nix b/pkgs/tools/misc/blink1-tool/default.nix index 4248dd6bd93..8d587e34af4 100644 --- a/pkgs/tools/misc/blink1-tool/default.nix +++ b/pkgs/tools/misc/blink1-tool/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, libusb1, pkgconfig, ... }: stdenv.mkDerivation rec { - name = "blink1-${version}"; + pname = "blink1"; version = "1.98a"; src = fetchurl { diff --git a/pkgs/tools/misc/blsd/default.nix b/pkgs/tools/misc/blsd/default.nix index 8e3e08fb5e5..655fd44c039 100644 --- a/pkgs/tools/misc/blsd/default.nix +++ b/pkgs/tools/misc/blsd/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub, pkgconfig, libgit2 }: buildGoPackage rec { - name = "blsd-${version}"; + pname = "blsd"; version = "2017-07-27"; goPackagePath = "github.com/junegunn/blsd"; diff --git a/pkgs/tools/misc/bmon/default.nix b/pkgs/tools/misc/bmon/default.nix index fc10538bbbb..e4664e34b96 100644 --- a/pkgs/tools/misc/bmon/default.nix +++ b/pkgs/tools/misc/bmon/default.nix @@ -2,7 +2,7 @@ , libnl }: stdenv.mkDerivation rec { - name = "bmon-${version}"; + pname = "bmon"; version = "4.0"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/calamares/default.nix b/pkgs/tools/misc/calamares/default.nix index 8a269e3eb4b..070b7a7699c 100644 --- a/pkgs/tools/misc/calamares/default.nix +++ b/pkgs/tools/misc/calamares/default.nix @@ -5,13 +5,12 @@ }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "calamares"; version = "3.2.8"; # release including submodule src = fetchurl { - url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${name}.tar.gz"; + url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${pname}-${version}.tar.gz"; sha256 = "1ymyl12fzxc5jjfbw4pfmgzp036w0dai76f7anilw2bnwfzq5g62"; }; diff --git a/pkgs/tools/misc/capture/default.nix b/pkgs/tools/misc/capture/default.nix index a3b30423aa8..377297ee479 100644 --- a/pkgs/tools/misc/capture/default.nix +++ b/pkgs/tools/misc/capture/default.nix @@ -1,7 +1,7 @@ { stdenv, slop, ffmpeg, fetchFromGitHub, makeWrapper}: stdenv.mkDerivation rec { - name = "capture-unstable-${version}"; + pname = "capture-unstable"; version = "2019-03-10"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/chelf/default.nix b/pkgs/tools/misc/chelf/default.nix index 4c54ab239d2..f9740f22375 100644 --- a/pkgs/tools/misc/chelf/default.nix +++ b/pkgs/tools/misc/chelf/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "chelf-${version}"; + pname = "chelf"; version = "0.2.2"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/chezmoi/default.nix b/pkgs/tools/misc/chezmoi/default.nix index f15dfc2adba..a5500d65c51 100644 --- a/pkgs/tools/misc/chezmoi/default.nix +++ b/pkgs/tools/misc/chezmoi/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "chezmoi-${version}"; + pname = "chezmoi"; version = "1.3.0"; goPackagePath = "github.com/twpayne/chezmoi"; diff --git a/pkgs/tools/misc/cht.sh/default.nix b/pkgs/tools/misc/cht.sh/default.nix index 48ce782536f..a1b1b4eac2d 100644 --- a/pkgs/tools/misc/cht.sh/default.nix +++ b/pkgs/tools/misc/cht.sh/default.nix @@ -8,7 +8,7 @@ }: stdenv.mkDerivation rec { - name = "cht.sh-${version}"; + pname = "cht.sh"; version = "unstable-2019-08-06"; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/misc/ckb-next/default.nix b/pkgs/tools/misc/ckb-next/default.nix index fdb0f008a6c..9d2126db9ff 100644 --- a/pkgs/tools/misc/ckb-next/default.nix +++ b/pkgs/tools/misc/ckb-next/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { version = "0.3.2"; - name = "ckb-next-${version}"; + pname = "ckb-next"; src = fetchFromGitHub { owner = "ckb-next"; diff --git a/pkgs/tools/misc/clac/default.nix b/pkgs/tools/misc/clac/default.nix index e4b3fab818b..f71faf6ab74 100644 --- a/pkgs/tools/misc/clac/default.nix +++ b/pkgs/tools/misc/clac/default.nix @@ -1,6 +1,5 @@ {stdenv, fetchFromGitHub}: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "clac"; version = "0.0.0.20170503"; diff --git a/pkgs/tools/misc/clex/default.nix b/pkgs/tools/misc/clex/default.nix index 54a6fac17a3..d5fd4e97df1 100644 --- a/pkgs/tools/misc/clex/default.nix +++ b/pkgs/tools/misc/clex/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ncurses }: stdenv.mkDerivation rec { - name = "clex-${version}"; + pname = "clex"; version = "4.6.patch9"; src = fetchurl { sha256 = "1qj5yp8k90wag5sb3zrm2pn90qqx3zbrgf2gqpqpdqmlgffnv1jc"; - url = "${meta.homepage}/download/${name}.tar.gz"; + url = "${meta.homepage}/download/${pname}-${version}.tar.gz"; }; buildInputs = [ ncurses ]; diff --git a/pkgs/tools/misc/clipnotify/default.nix b/pkgs/tools/misc/clipnotify/default.nix index 6bd0f8be2fa..91c428def28 100644 --- a/pkgs/tools/misc/clipnotify/default.nix +++ b/pkgs/tools/misc/clipnotify/default.nix @@ -1,6 +1,6 @@ { libX11, libXfixes, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "clipnotify-${version}"; + pname = "clipnotify"; version = "git-2018-02-20"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/clipster/default.nix b/pkgs/tools/misc/clipster/default.nix index ed0239256cd..d12f9f6c1f4 100644 --- a/pkgs/tools/misc/clipster/default.nix +++ b/pkgs/tools/misc/clipster/default.nix @@ -2,7 +2,7 @@ gobject-introspection, wrapGAppsHook }: stdenv.mkDerivation rec { - name = "clipster-${version}"; + pname = "clipster"; version = "2.0.2"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/cloc/default.nix b/pkgs/tools/misc/cloc/default.nix index 38041f0b32d..987d694a0a4 100644 --- a/pkgs/tools/misc/cloc/default.nix +++ b/pkgs/tools/misc/cloc/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, makeWrapper, perlPackages }: stdenv.mkDerivation rec { - name = "cloc-${version}"; + pname = "cloc"; version = "1.82"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/cloud-sql-proxy/default.nix b/pkgs/tools/misc/cloud-sql-proxy/default.nix index b9046bf19ca..bc23958b581 100644 --- a/pkgs/tools/misc/cloud-sql-proxy/default.nix +++ b/pkgs/tools/misc/cloud-sql-proxy/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { - name = "cloud-sql-proxy-${version}"; + pname = "cloud-sql-proxy"; version = "1.13"; goPackagePath = "github.com/GoogleCloudPlatform/cloudsql-proxy"; diff --git a/pkgs/tools/misc/cloud-utils/default.nix b/pkgs/tools/misc/cloud-utils/default.nix index bda8ebcf3b0..5408c39920b 100644 --- a/pkgs/tools/misc/cloud-utils/default.nix +++ b/pkgs/tools/misc/cloud-utils/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { # NOTICE: if you bump this, make sure to run # $ nix-build nixos/release-combined.nix -A nixos.tests.ec2-nixops # growpart is needed in initrd in nixos/system/boot/grow-partition.nix - name = "cloud-utils-${version}"; + pname = "cloud-utils"; version = "0.30"; src = fetchurl { url = "https://launchpad.net/cloud-utils/trunk/0.3/+download/cloud-utils-${version}.tar.gz"; diff --git a/pkgs/tools/misc/colord-kde/default.nix b/pkgs/tools/misc/colord-kde/default.nix index 12821cf864c..41c80146e68 100644 --- a/pkgs/tools/misc/colord-kde/default.nix +++ b/pkgs/tools/misc/colord-kde/default.nix @@ -6,11 +6,11 @@ }: stdenv.mkDerivation rec { - name = "colord-kde-${version}"; + pname = "colord-kde"; version = "0.5.0"; src = fetchurl { - url = "http://download.kde.org/stable/colord-kde/${version}/src/${name}.tar.xz"; + url = "http://download.kde.org/stable/colord-kde/${version}/src/${pname}-${version}.tar.xz"; sha256 = "0brdnpflm95vf4l41clrqxwvjrdwhs859n7401wxcykkmw4m0m3c"; }; diff --git a/pkgs/tools/misc/contacts/default.nix b/pkgs/tools/misc/contacts/default.nix index a7d230d8e89..1b3c5f16969 100644 --- a/pkgs/tools/misc/contacts/default.nix +++ b/pkgs/tools/misc/contacts/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.1a-3"; - name = "contacts-${version}"; + pname = "contacts"; src = fetchurl { url = "https://github.com/dhess/contacts/archive/4092a3c6615d7a22852a3bafc44e4aeeb698aa8f.tar.gz"; diff --git a/pkgs/tools/misc/cowsay/default.nix b/pkgs/tools/misc/cowsay/default.nix index 6b5c9c51394..fb44b051b7e 100644 --- a/pkgs/tools/misc/cowsay/default.nix +++ b/pkgs/tools/misc/cowsay/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec{ version = "3.03+dfsg2"; - name = "cowsay-${version}"; + pname = "cowsay"; src = fetchurl { url = "http://http.debian.net/debian/pool/main/c/cowsay/cowsay_${version}.orig.tar.gz"; diff --git a/pkgs/tools/misc/cpulimit/default.nix b/pkgs/tools/misc/cpulimit/default.nix index 9a764c12941..547e2a1f059 100644 --- a/pkgs/tools/misc/cpulimit/default.nix +++ b/pkgs/tools/misc/cpulimit/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "cpulimit-${version}"; + pname = "cpulimit"; version = "2.6"; src = fetchurl { - url = "mirror://sourceforge/limitcpu/${name}.tar.gz"; + url = "mirror://sourceforge/limitcpu/${pname}-${version}.tar.gz"; sha256 = "0xf0r6zxaqan1drz61nqf95p2pkiiihpvrjhrr9dx9j3vswyx31g"; }; diff --git a/pkgs/tools/misc/cpuminer/default.nix b/pkgs/tools/misc/cpuminer/default.nix index b4abb3097b9..db0ab75d916 100644 --- a/pkgs/tools/misc/cpuminer/default.nix +++ b/pkgs/tools/misc/cpuminer/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, curl, jansson, perl }: stdenv.mkDerivation rec { - name = "cpuminer-${version}"; + pname = "cpuminer"; version = "2.5.0"; src = fetchurl { - url = "mirror://sourceforge/cpuminer/pooler-${name}.tar.gz"; + url = "mirror://sourceforge/cpuminer/pooler-${pname}-${version}.tar.gz"; sha256 = "1xalrfrk5hvh1jh9kbqhib2an82ypd46vl9glaxhz3rbjld7c5pa"; }; diff --git a/pkgs/tools/misc/crex/default.nix b/pkgs/tools/misc/crex/default.nix index 696fbe86383..a00f8d6654f 100644 --- a/pkgs/tools/misc/crex/default.nix +++ b/pkgs/tools/misc/crex/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "crex"; version = "0.2.5"; diff --git a/pkgs/tools/misc/cunit/default.nix b/pkgs/tools/misc/cunit/default.nix index 6bbf049d244..f1930c925ff 100644 --- a/pkgs/tools/misc/cunit/default.nix +++ b/pkgs/tools/misc/cunit/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, autoconf, automake, libtool, autoreconfHook}: stdenv.mkDerivation rec { - name = "CUnit-${version}"; + pname = "CUnit"; version = "2.1-3"; nativeBuildInputs = [ autoreconfHook ]; buildInputs = [autoconf automake libtool]; src = fetchurl { - url = "mirror://sourceforge/cunit/CUnit/${version}/${name}.tar.bz2"; + url = "mirror://sourceforge/cunit/CUnit/${version}/${pname}-${version}.tar.bz2"; sha256 = "057j82da9vv4li4z5ri3227ybd18nzyq81f6gsvhifs5z0vr3cpm"; }; diff --git a/pkgs/tools/misc/cutecom/default.nix b/pkgs/tools/misc/cutecom/default.nix index 94f36adcf9b..83010477c50 100644 --- a/pkgs/tools/misc/cutecom/default.nix +++ b/pkgs/tools/misc/cutecom/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, qtbase, qtserialport, cmake }: stdenv.mkDerivation rec { - name = "cutecom-${version}"; + pname = "cutecom"; version = "0.50.0"; src = fetchFromGitHub { owner = "neundorf"; diff --git a/pkgs/tools/misc/dashing/default.nix b/pkgs/tools/misc/dashing/default.nix index 5a82c766089..f45889e78d8 100644 --- a/pkgs/tools/misc/dashing/default.nix +++ b/pkgs/tools/misc/dashing/default.nix @@ -2,7 +2,7 @@ { stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { - name = "dashing-unstable-${version}"; + pname = "dashing-unstable"; version = "2018-02-15"; rev = "0e0519d76ed6bbbe02b00ee1d1ac24697d349f49"; diff --git a/pkgs/tools/misc/datamash/default.nix b/pkgs/tools/misc/datamash/default.nix index 230a97da5e4..efeb760e560 100644 --- a/pkgs/tools/misc/datamash/default.nix +++ b/pkgs/tools/misc/datamash/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "datamash-${version}"; + pname = "datamash"; version = "1.4"; src = fetchurl { - url = "mirror://gnu/datamash/${name}.tar.gz"; + url = "mirror://gnu/datamash/${pname}-${version}.tar.gz"; sha256 = "fa44dd2d5456bcb94ef49dfc6cfe62c83fd53ac435119a85d34e6812f6e6472a"; }; diff --git a/pkgs/tools/misc/dateutils/default.nix b/pkgs/tools/misc/dateutils/default.nix index 05a312bb8bc..b440808833f 100644 --- a/pkgs/tools/misc/dateutils/default.nix +++ b/pkgs/tools/misc/dateutils/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "0.4.6"; - name = "dateutils-${version}"; + pname = "dateutils"; src = fetchurl { - url = "https://bitbucket.org/hroptatyr/dateutils/downloads/${name}.tar.xz"; + url = "https://bitbucket.org/hroptatyr/dateutils/downloads/${pname}-${version}.tar.xz"; sha256 = "1kaphw474lz7336awr9rzsgcsr1p9njsjsryd8i0ywg5g8qp3816"; }; diff --git a/pkgs/tools/misc/dbus-map/default.nix b/pkgs/tools/misc/dbus-map/default.nix index 8dcaecf9851..ab52d73ac27 100644 --- a/pkgs/tools/misc/dbus-map/default.nix +++ b/pkgs/tools/misc/dbus-map/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub, pkgconfig, glib, procps, libxml2 }: stdenv.mkDerivation rec { - name = "dbus-map-${version}"; + pname = "dbus-map"; version = "2015-05-28"; src = fetchFromGitHub { owner = "taviso"; diff --git a/pkgs/tools/misc/ddcutil/default.nix b/pkgs/tools/misc/ddcutil/default.nix index 3a607b4ec75..0ddceb76ffe 100644 --- a/pkgs/tools/misc/ddcutil/default.nix +++ b/pkgs/tools/misc/ddcutil/default.nix @@ -2,7 +2,7 @@ , glib, i2c-tools, udev, libgudev, libusb, libdrm, xorg }: stdenv.mkDerivation rec { - name = "ddcutil-${version}"; + pname = "ddcutil"; version = "0.9.5"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/debian-devscripts/default.nix b/pkgs/tools/misc/debian-devscripts/default.nix index 3ed284aa3e1..35db9ef7db3 100644 --- a/pkgs/tools/misc/debian-devscripts/default.nix +++ b/pkgs/tools/misc/debian-devscripts/default.nix @@ -9,7 +9,7 @@ let inherit (python3Packages) python setuptools; in stdenv.mkDerivation rec { version = "2.16.8"; - name = "debian-devscripts-${version}"; + pname = "debian-devscripts"; src = fetchurl { url = "mirror://debian/pool/main/d/devscripts/devscripts_${version}.tar.xz"; diff --git a/pkgs/tools/misc/ding-libs/default.nix b/pkgs/tools/misc/ding-libs/default.nix index 61c8a8370d7..e99e9289b67 100644 --- a/pkgs/tools/misc/ding-libs/default.nix +++ b/pkgs/tools/misc/ding-libs/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, check }: stdenv.mkDerivation rec { - name = "ding-libs-${version}"; + pname = "ding-libs"; version = "0.6.1"; src = fetchurl { diff --git a/pkgs/tools/misc/direnv/default.nix b/pkgs/tools/misc/direnv/default.nix index e71971ccb09..22c0721d79d 100644 --- a/pkgs/tools/misc/direnv/default.nix +++ b/pkgs/tools/misc/direnv/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, buildGoPackage, bash }: buildGoPackage rec { - name = "direnv-${version}"; + pname = "direnv"; version = "2.20.1"; goPackagePath = "github.com/direnv/direnv"; diff --git a/pkgs/tools/misc/diskscan/default.nix b/pkgs/tools/misc/diskscan/default.nix index 7b97e58fdf9..193a631ccdc 100644 --- a/pkgs/tools/misc/diskscan/default.nix +++ b/pkgs/tools/misc/diskscan/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, ncurses, zlib }: stdenv.mkDerivation rec { - name = "diskscan-${version}"; + pname = "diskscan"; version = "0.20"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/docbook2mdoc/default.nix b/pkgs/tools/misc/docbook2mdoc/default.nix index affcd310bea..efe65683e07 100644 --- a/pkgs/tools/misc/docbook2mdoc/default.nix +++ b/pkgs/tools/misc/docbook2mdoc/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, expat }: stdenv.mkDerivation rec { - name = "docbook2mdoc-${version}"; + pname = "docbook2mdoc"; version = "0.0.9"; src = fetchurl { - url = "http://mdocml.bsd.lv/docbook2mdoc/snapshots/${name}.tgz"; + url = "http://mdocml.bsd.lv/docbook2mdoc/snapshots/${pname}-${version}.tgz"; sha256 = "07il80sg89xf6ym4bry6hxdacfzqgbwkxzyf7bjaihmw5jj0lclk"; }; diff --git a/pkgs/tools/misc/docker-ls/default.nix b/pkgs/tools/misc/docker-ls/default.nix index f6bc091c14a..c1baf8e82f5 100644 --- a/pkgs/tools/misc/docker-ls/default.nix +++ b/pkgs/tools/misc/docker-ls/default.nix @@ -1,7 +1,7 @@ { buildGoPackage, fetchFromGitHub, stdenv, docker }: buildGoPackage rec { - name = "docker-ls-${version}"; + pname = "docker-ls"; version = "0.3.2"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/docui/default.nix b/pkgs/tools/misc/docui/default.nix index 979b3be0493..74ce8c102c6 100644 --- a/pkgs/tools/misc/docui/default.nix +++ b/pkgs/tools/misc/docui/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { - name = "docui-${version}"; + pname = "docui"; version = "1.0.3"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/dtach/default.nix b/pkgs/tools/misc/dtach/default.nix index c50e3adb6ab..7d85decbb84 100644 --- a/pkgs/tools/misc/dtach/default.nix +++ b/pkgs/tools/misc/dtach/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "dtach-${version}"; + pname = "dtach"; version = "0.9"; src = fetchurl { - url = "mirror://sourceforge/project/dtach/dtach/${version}/${name}.tar.gz"; + url = "mirror://sourceforge/project/dtach/dtach/${version}/${pname}-${version}.tar.gz"; sha256 = "1wwj2hlngi8qn2pisvhyfxxs8gyqjlgrrv5lz91w8ly54dlzvs9j"; }; diff --git a/pkgs/tools/misc/duc/default.nix b/pkgs/tools/misc/duc/default.nix index 82b29bb67f6..77ad7cd8ccd 100644 --- a/pkgs/tools/misc/duc/default.nix +++ b/pkgs/tools/misc/duc/default.nix @@ -7,7 +7,7 @@ assert enableCairo -> cairo != null && pango != null; stdenv.mkDerivation rec { - name = "duc-${version}"; + pname = "duc"; version = "1.4.4"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/dumptorrent/default.nix b/pkgs/tools/misc/dumptorrent/default.nix index 892287fa2d7..1b9a6c9bbea 100644 --- a/pkgs/tools/misc/dumptorrent/default.nix +++ b/pkgs/tools/misc/dumptorrent/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "dumptorrent-${version}"; + pname = "dumptorrent"; version = "1.2"; src = fetchurl { diff --git a/pkgs/tools/misc/dynamic-colors/default.nix b/pkgs/tools/misc/dynamic-colors/default.nix index e2f2f51ccfb..799236a5804 100644 --- a/pkgs/tools/misc/dynamic-colors/default.nix +++ b/pkgs/tools/misc/dynamic-colors/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "dynamic-colors-${version}"; + pname = "dynamic-colors"; version = "0.2.2.1"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/emv/default.nix b/pkgs/tools/misc/emv/default.nix index 6f491ac9349..160c3982cc1 100644 --- a/pkgs/tools/misc/emv/default.nix +++ b/pkgs/tools/misc/emv/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "emv-${version}"; + pname = "emv"; version = "1.95"; src = fetchurl { diff --git a/pkgs/tools/misc/entr/default.nix b/pkgs/tools/misc/entr/default.nix index 19bcd77923b..954b570c79d 100644 --- a/pkgs/tools/misc/entr/default.nix +++ b/pkgs/tools/misc/entr/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, coreutils, ncurses }: stdenv.mkDerivation rec { - name = "entr-${version}"; + pname = "entr"; version = "4.2"; src = fetchurl { - url = "http://entrproject.org/code/${name}.tar.gz"; + url = "http://entrproject.org/code/${pname}-${version}.tar.gz"; sha256 = "0w2xkf77jikcjh15fp9g7661ss30pz3jbnh261vqpaqavwah4c17"; }; diff --git a/pkgs/tools/misc/envdir-go/default.nix b/pkgs/tools/misc/envdir-go/default.nix index ea08608da01..db31df982cf 100644 --- a/pkgs/tools/misc/envdir-go/default.nix +++ b/pkgs/tools/misc/envdir-go/default.nix @@ -3,7 +3,7 @@ buildGoPackage rec { version = "1.0.0"; - name = "envdir-${version}"; + pname = "envdir"; goPackagePath = "github.com/d10n/envdir"; diff --git a/pkgs/tools/misc/envsubst/default.nix b/pkgs/tools/misc/envsubst/default.nix index 86f78af2560..9b2153d17cb 100644 --- a/pkgs/tools/misc/envsubst/default.nix +++ b/pkgs/tools/misc/envsubst/default.nix @@ -1,7 +1,7 @@ { lib, fetchFromGitHub, buildGoPackage }: buildGoPackage rec { - name = "envsubst-${version}"; + pname = "envsubst"; version = "1.1.0"; goPackagePath = "github.com/a8m/envsubst"; diff --git a/pkgs/tools/misc/eot-utilities/default.nix b/pkgs/tools/misc/eot-utilities/default.nix index b9efead2798..8d65aee9e7a 100644 --- a/pkgs/tools/misc/eot-utilities/default.nix +++ b/pkgs/tools/misc/eot-utilities/default.nix @@ -3,7 +3,6 @@ stdenv.mkDerivation rec { pname = "eot_utilities"; version = "1.1"; - name = "${pname}-${version}"; src = fetchurl { url = "https://www.w3.org/Tools/eot-utils/eot-utilities-${version}.tar.gz"; diff --git a/pkgs/tools/misc/esptool-ck/default.nix b/pkgs/tools/misc/esptool-ck/default.nix index 9d3b796c879..52b56f10ea9 100644 --- a/pkgs/tools/misc/esptool-ck/default.nix +++ b/pkgs/tools/misc/esptool-ck/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "esptool-ck-${version}"; + pname = "esptool-ck"; version = "0.4.13"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/ethtool/default.nix b/pkgs/tools/misc/ethtool/default.nix index a6afa03a3f1..8fa1eccadf0 100644 --- a/pkgs/tools/misc/ethtool/default.nix +++ b/pkgs/tools/misc/ethtool/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "ethtool-${version}"; + pname = "ethtool"; version = "5.2"; src = fetchurl { - url = "mirror://kernel/software/network/ethtool/${name}.tar.xz"; + url = "mirror://kernel/software/network/ethtool/${pname}-${version}.tar.xz"; sha256 = "01bq2g7amycfp4syzcswz52pgphdgswklziqfjwnq3c6844dfpv6"; }; diff --git a/pkgs/tools/misc/expect/default.nix b/pkgs/tools/misc/expect/default.nix index bb701f187fa..fe18a506560 100644 --- a/pkgs/tools/misc/expect/default.nix +++ b/pkgs/tools/misc/expect/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "5.45.4"; - name = "expect-${version}"; + pname = "expect"; src = fetchurl { url = "mirror://sourceforge/expect/Expect/${version}/expect${version}.tar.gz"; diff --git a/pkgs/tools/misc/fdupes/default.nix b/pkgs/tools/misc/fdupes/default.nix index 84b61f9aae9..25179c36c01 100644 --- a/pkgs/tools/misc/fdupes/default.nix +++ b/pkgs/tools/misc/fdupes/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "fdupes-${version}"; + pname = "fdupes"; version = "1.6.1"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/file/default.nix b/pkgs/tools/misc/file/default.nix index 14858428ee9..b3ed85ca228 100644 --- a/pkgs/tools/misc/file/default.nix +++ b/pkgs/tools/misc/file/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, file, zlib, libgnurx }: stdenv.mkDerivation rec { - name = "file-${version}"; + pname = "file"; version = "5.37"; src = fetchurl { urls = [ - "ftp://ftp.astron.com/pub/file/${name}.tar.gz" - "https://distfiles.macports.org/file/${name}.tar.gz" + "ftp://ftp.astron.com/pub/file/${pname}-${version}.tar.gz" + "https://distfiles.macports.org/file/${pname}-${version}.tar.gz" ]; sha256 = "0zz0p9bqnswfx0c16j8k62ivjq1m16x10xqv4hy9lcyxyxkkkhg9"; }; diff --git a/pkgs/tools/misc/filebench/default.nix b/pkgs/tools/misc/filebench/default.nix index e934da76e6e..a16695cf7c3 100644 --- a/pkgs/tools/misc/filebench/default.nix +++ b/pkgs/tools/misc/filebench/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, autoreconfHook, bison, flex }: stdenv.mkDerivation rec { - name = "filebench-${version}"; + pname = "filebench"; version = "1.4.9.1"; src = fetchurl { - url = "mirror://sourceforge/filebench/${name}.tar.gz"; + url = "mirror://sourceforge/filebench/${pname}-${version}.tar.gz"; sha256 = "13hmx67lsz367sn8lrvz1780mfczlbiz8v80gig9kpkpf009yksc"; }; diff --git a/pkgs/tools/misc/flashrom/default.nix b/pkgs/tools/misc/flashrom/default.nix index a7ca7700c71..18914a304f3 100644 --- a/pkgs/tools/misc/flashrom/default.nix +++ b/pkgs/tools/misc/flashrom/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, pkgconfig, libftdi, pciutils }: stdenv.mkDerivation rec { - name = "flashrom-${version}"; + pname = "flashrom"; version = "1.1"; src = fetchurl { diff --git a/pkgs/tools/misc/fltrdr/default.nix b/pkgs/tools/misc/fltrdr/default.nix index a72279b90b6..692f7daa9cf 100644 --- a/pkgs/tools/misc/fltrdr/default.nix +++ b/pkgs/tools/misc/fltrdr/default.nix @@ -5,7 +5,7 @@ }: stdenv.mkDerivation rec { - name = "fltrdr-${version}"; + pname = "fltrdr"; version = "0.3.1"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/fondu/default.nix b/pkgs/tools/misc/fondu/default.nix index e31da3bfd21..33efd2bd614 100644 --- a/pkgs/tools/misc/fondu/default.nix +++ b/pkgs/tools/misc/fondu/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "060102"; - name = "fondu-${version}"; + pname = "fondu"; src = fetchurl { url = "http://fondu.sourceforge.net/fondu_src-${version}.tgz"; diff --git a/pkgs/tools/misc/fpart/default.nix b/pkgs/tools/misc/fpart/default.nix index f75dfec5e56..563152cc10d 100644 --- a/pkgs/tools/misc/fpart/default.nix +++ b/pkgs/tools/misc/fpart/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { - name = "fpart-${version}"; + pname = "fpart"; version = "1.1.0"; src = fetchFromGitHub { owner = "martymac"; repo = "fpart"; - rev = name; + rev = "${pname}-${version}"; sha256 = "0h3mqc1xj5j2z8s8g3pvvpbjs6x74dj8niyh3p2ymla35kbzskf4"; }; diff --git a/pkgs/tools/misc/fpp/default.nix b/pkgs/tools/misc/fpp/default.nix index 6271eb599b5..bfaf30f3f37 100644 --- a/pkgs/tools/misc/fpp/default.nix +++ b/pkgs/tools/misc/fpp/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, python27 }: stdenv.mkDerivation rec { - name = "fpp-${version}"; + pname = "fpp"; version = "0.7.2"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/fsmark/default.nix b/pkgs/tools/misc/fsmark/default.nix index 0e821ce7f1f..ac56d948bda 100644 --- a/pkgs/tools/misc/fsmark/default.nix +++ b/pkgs/tools/misc/fsmark/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "fsmark-${version}"; + pname = "fsmark"; version = "3.3"; src = fetchurl { diff --git a/pkgs/tools/misc/fsmon/default.nix b/pkgs/tools/misc/fsmon/default.nix index f9e40b6b786..dde69778e5f 100644 --- a/pkgs/tools/misc/fsmon/default.nix +++ b/pkgs/tools/misc/fsmon/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "fsmon-${version}"; + pname = "fsmon"; version = "1.5"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/fsql/default.nix b/pkgs/tools/misc/fsql/default.nix index e723db260eb..4e7db2dc484 100644 --- a/pkgs/tools/misc/fsql/default.nix +++ b/pkgs/tools/misc/fsql/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "fsql-${version}"; + pname = "fsql"; version = "0.3.1"; goPackagePath = "github.com/kshvmdn/fsql"; diff --git a/pkgs/tools/misc/fwup/default.nix b/pkgs/tools/misc/fwup/default.nix index a5baf4de5b8..a189e8c1dba 100644 --- a/pkgs/tools/misc/fwup/default.nix +++ b/pkgs/tools/misc/fwup/default.nix @@ -3,7 +3,7 @@ , libarchive, darwin, coreutils }: stdenv.mkDerivation rec { - name = "fwup-${version}"; + pname = "fwup"; version = "1.3.1"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/fzy/default.nix b/pkgs/tools/misc/fzy/default.nix index 6a04213e21a..5b05ce534d7 100644 --- a/pkgs/tools/misc/fzy/default.nix +++ b/pkgs/tools/misc/fzy/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "fzy-${version}"; + pname = "fzy"; version = "1.0"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/gams/default.nix b/pkgs/tools/misc/gams/default.nix index 011231692f3..ba0b76026a5 100644 --- a/pkgs/tools/misc/gams/default.nix +++ b/pkgs/tools/misc/gams/default.nix @@ -4,7 +4,7 @@ assert licenseFile != null; stdenv.mkDerivation rec { version = "25.0.2"; - name = "gams-${version}"; + pname = "gams"; src = fetchurl { url = "https://d37drm4t2jghv5.cloudfront.net/distributions/${version}/linux/linux_x64_64_sfx.exe"; sha256 = "4f95389579f33ff7c2586838a2c19021aa0746279555cbb51aa6e0efd09bd297"; diff --git a/pkgs/tools/misc/gawp/default.nix b/pkgs/tools/misc/gawp/default.nix index c187b09624a..002853abc1d 100644 --- a/pkgs/tools/misc/gawp/default.nix +++ b/pkgs/tools/misc/gawp/default.nix @@ -3,7 +3,7 @@ with builtins; buildGoPackage rec { - name = "gawp-${version}"; + pname = "gawp"; version = "20160121-${stdenv.lib.strings.substring 0 7 rev}"; rev = "5db2d8faa220e8d6eaf8677354bd197bf621ff7f"; diff --git a/pkgs/tools/misc/gbdfed/default.nix b/pkgs/tools/misc/gbdfed/default.nix index 6307d012deb..9b41dba4e25 100644 --- a/pkgs/tools/misc/gbdfed/default.nix +++ b/pkgs/tools/misc/gbdfed/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "1.6"; - name = "gbdfed-${version}"; + pname = "gbdfed"; src = fetchurl { - url = "http://sofia.nmsu.edu/~mleisher/Software/gbdfed/${name}.tar.bz2"; + url = "http://sofia.nmsu.edu/~mleisher/Software/gbdfed/${pname}-${version}.tar.bz2"; sha256 = "0g09k6wim58hngxncq2brr7mwjm92j3famp0vs4b3p48wr65vcjx"; }; diff --git a/pkgs/tools/misc/geekbench/default.nix b/pkgs/tools/misc/geekbench/default.nix index fddb1c99634..33b884a5eb9 100644 --- a/pkgs/tools/misc/geekbench/default.nix +++ b/pkgs/tools/misc/geekbench/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, makeWrapper }: stdenv.mkDerivation rec { - name = "geekbench-${version}"; + pname = "geekbench"; version = "4.4.0"; src = fetchurl { diff --git a/pkgs/tools/misc/geteltorito/default.nix b/pkgs/tools/misc/geteltorito/default.nix index b95c7179141..d6fbb623331 100644 --- a/pkgs/tools/misc/geteltorito/default.nix +++ b/pkgs/tools/misc/geteltorito/default.nix @@ -1,7 +1,7 @@ { stdenv, perl, ronn, fetchurl }: stdenv.mkDerivation rec { - name = "geteltorito-${version}"; + pname = "geteltorito"; version = "0.6"; src = fetchurl { diff --git a/pkgs/tools/misc/gibo/default.nix b/pkgs/tools/misc/gibo/default.nix index 5c8bacac162..a8e957ce484 100644 --- a/pkgs/tools/misc/gibo/default.nix +++ b/pkgs/tools/misc/gibo/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, coreutils, findutils, git }: stdenv.mkDerivation rec { - name = "gibo-${version}"; + pname = "gibo"; version = "1.0.6"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/git-town/default.nix b/pkgs/tools/misc/git-town/default.nix index afcf9cf4c78..5438f71930d 100644 --- a/pkgs/tools/misc/git-town/default.nix +++ b/pkgs/tools/misc/git-town/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "git-town-${version}"; + pname = "git-town"; version = "7.2.0"; goPackagePath = "github.com/Originate/git-town"; diff --git a/pkgs/tools/misc/gnokii/default.nix b/pkgs/tools/misc/gnokii/default.nix index be4de738c1c..581a1f84fc7 100644 --- a/pkgs/tools/misc/gnokii/default.nix +++ b/pkgs/tools/misc/gnokii/default.nix @@ -2,12 +2,12 @@ , readline, pcsclite, libical, gtk2, glib, libXpm }: stdenv.mkDerivation rec { - name = "gnokii-${version}"; + pname = "gnokii"; version = "0.6.31"; src = fetchurl { sha256 = "0sjjhm40662bj6j0jh3sd25b8nww54nirpwamz618rg6pb5hjwm8"; - url = "https://www.gnokii.org/download/gnokii/${name}.tar.gz"; + url = "https://www.gnokii.org/download/gnokii/${pname}-${version}.tar.gz"; }; buildInputs = [ diff --git a/pkgs/tools/misc/goaccess/default.nix b/pkgs/tools/misc/goaccess/default.nix index 0430f010e97..6fad9829d79 100644 --- a/pkgs/tools/misc/goaccess/default.nix +++ b/pkgs/tools/misc/goaccess/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.3"; - name = "goaccess-${version}"; + pname = "goaccess"; src = fetchurl { url = "https://tar.goaccess.io/goaccess-${version}.tar.gz"; diff --git a/pkgs/tools/misc/gosu/default.nix b/pkgs/tools/misc/gosu/default.nix index d7c10220f4b..bd53529a5d2 100644 --- a/pkgs/tools/misc/gosu/default.nix +++ b/pkgs/tools/misc/gosu/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { - name = "gosu-${version}"; + pname = "gosu"; version = "2017-05-09"; rev = "e87cf95808a7b16208515c49012aa3410bc5bba8"; diff --git a/pkgs/tools/misc/graylog/default.nix b/pkgs/tools/misc/graylog/default.nix index bdb919006fd..f951e6cba70 100644 --- a/pkgs/tools/misc/graylog/default.nix +++ b/pkgs/tools/misc/graylog/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "3.0.2"; - name = "graylog-${version}"; + pname = "graylog"; src = fetchurl { url = "https://packages.graylog2.org/releases/graylog/graylog-${version}.tgz"; diff --git a/pkgs/tools/misc/grc/default.nix b/pkgs/tools/misc/grc/default.nix index 451828b0f47..fde08702f67 100644 --- a/pkgs/tools/misc/grc/default.nix +++ b/pkgs/tools/misc/grc/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, python3Packages, makeWrapper }: stdenv.mkDerivation rec { - name = "grc-${version}"; + pname = "grc"; version = "1.11.3"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/grub4dos/default.nix b/pkgs/tools/misc/grub4dos/default.nix index ec77f396527..edb9508df31 100644 --- a/pkgs/tools/misc/grub4dos/default.nix +++ b/pkgs/tools/misc/grub4dos/default.nix @@ -5,7 +5,7 @@ let arch = else if stdenv.isx86_64 then "x86_64" else throw "Unknown architecture"; in stdenv.mkDerivation rec { - name = "grub4dos-${version}"; + pname = "grub4dos"; version = "0.4.6a-2019-05-12"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/gsmartcontrol/default.nix b/pkgs/tools/misc/gsmartcontrol/default.nix index f7cdf5ca608..78a678f0714 100644 --- a/pkgs/tools/misc/gsmartcontrol/default.nix +++ b/pkgs/tools/misc/gsmartcontrol/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version="1.1.3"; - name = "gsmartcontrol-${version}"; + pname = "gsmartcontrol"; src = fetchurl { url = "mirror://sourceforge/gsmartcontrol/gsmartcontrol-${version}.tar.bz2"; diff --git a/pkgs/tools/misc/gti/default.nix b/pkgs/tools/misc/gti/default.nix index a66b32c789c..bca481cade4 100644 --- a/pkgs/tools/misc/gti/default.nix +++ b/pkgs/tools/misc/gti/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "gti-${version}"; + pname = "gti"; version = "1.6.1"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/h5utils/default.nix b/pkgs/tools/misc/h5utils/default.nix index db18cae77b1..9fe26777110 100644 --- a/pkgs/tools/misc/h5utils/default.nix +++ b/pkgs/tools/misc/h5utils/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { version = "1.13.1"; - name = "h5utils-${version}"; + pname = "h5utils"; # fetchurl is used instead of fetchFromGitHub because the git repo version requires # additional tools to build compared to the tarball release; see the README for details. diff --git a/pkgs/tools/misc/hakuneko/default.nix b/pkgs/tools/misc/hakuneko/default.nix index be5e1371cd4..8c2e7dc7451 100644 --- a/pkgs/tools/misc/hakuneko/default.nix +++ b/pkgs/tools/misc/hakuneko/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, wxGTK30, openssl, curl }: stdenv.mkDerivation rec { - name = "hakuneko-${version}"; + pname = "hakuneko"; version = "1.4.2"; src = fetchurl { diff --git a/pkgs/tools/misc/hdf4/default.nix b/pkgs/tools/misc/hdf4/default.nix index bd3bebc881e..e765e923474 100644 --- a/pkgs/tools/misc/hdf4/default.nix +++ b/pkgs/tools/misc/hdf4/default.nix @@ -8,7 +8,7 @@ }: stdenv.mkDerivation rec { - name = "hdf-${version}"; + pname = "hdf"; version = "4.2.14"; src = fetchurl { url = "https://support.hdfgroup.org/ftp/HDF/releases/HDF${version}/src/hdf-${version}.tar.bz2"; diff --git a/pkgs/tools/misc/hdf5/1_8.nix b/pkgs/tools/misc/hdf5/1_8.nix index 17b48ad8741..d27f6fc01bc 100644 --- a/pkgs/tools/misc/hdf5/1_8.nix +++ b/pkgs/tools/misc/hdf5/1_8.nix @@ -24,9 +24,9 @@ let inherit (stdenv.lib) optional optionals; in stdenv.mkDerivation rec { version = "1.8.19"; - name = "hdf5-${version}"; + pname = "hdf5"; src = fetchurl { - url = "https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.8/${name}/src/${name}.tar.bz2"; + url = "https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.8/${pname}-${version}/src/${pname}-${version}.tar.bz2"; sha256 = "0f3jfbqpaaq21ighi40qzs52nb52kc2d2yjk541rjmsx20b3ih2r" ; }; diff --git a/pkgs/tools/misc/hdf5/default.nix b/pkgs/tools/misc/hdf5/default.nix index e6402322d35..336010718dd 100644 --- a/pkgs/tools/misc/hdf5/default.nix +++ b/pkgs/tools/misc/hdf5/default.nix @@ -17,9 +17,9 @@ let inherit (stdenv.lib) optional optionals; in stdenv.mkDerivation rec { version = "1.10.5"; - name = "hdf5-${version}"; + pname = "hdf5"; src = fetchurl { - url = "https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.10/${name}/src/${name}.tar.bz2"; + url = "https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.10/${pname}-${version}/src/${pname}-${version}.tar.bz2"; sha256 = "0i3g6v521vigzbx8wpd32ibsiiw92r65ca3qdbn0d8fj8f4fmmk8"; }; diff --git a/pkgs/tools/misc/hdfjava/default.nix b/pkgs/tools/misc/hdfjava/default.nix index 0fe72425d79..6087a76e6bd 100644 --- a/pkgs/tools/misc/hdfjava/default.nix +++ b/pkgs/tools/misc/hdfjava/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, cmake, javac }: stdenv.mkDerivation rec { - name = "hdf-java-${version}"; + pname = "hdf-java"; version = "3.3.2"; src = fetchurl { diff --git a/pkgs/tools/misc/hdfview/default.nix b/pkgs/tools/misc/hdfview/default.nix index 82801da322c..fb6914c01d0 100644 --- a/pkgs/tools/misc/hdfview/default.nix +++ b/pkgs/tools/misc/hdfview/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ant, javac, hdf_java }: stdenv.mkDerivation rec { - name = "hdfview-${version}"; + pname = "hdfview"; version = "2.14"; src = fetchurl { - url = "https://support.hdfgroup.org/ftp/HDF5/hdf-java/current/src/${name}.tar.gz"; + url = "https://support.hdfgroup.org/ftp/HDF5/hdf-java/current/src/${pname}-${version}.tar.gz"; sha256 = "0lv9djfm7hnp14mcyzbiax3xjb8vkbzhh7bdl6cvgy53pc08784p"; }; diff --git a/pkgs/tools/misc/hebcal/default.nix b/pkgs/tools/misc/hebcal/default.nix index 55542b4c7fc..39678abeba4 100644 --- a/pkgs/tools/misc/hebcal/default.nix +++ b/pkgs/tools/misc/hebcal/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "4.18"; - name = "hebcal-${version}"; + pname = "hebcal"; src = fetchFromGitHub { owner = "hebcal"; diff --git a/pkgs/tools/misc/hexd/default.nix b/pkgs/tools/misc/hexd/default.nix index b080e23b265..eabb7838e8a 100644 --- a/pkgs/tools/misc/hexd/default.nix +++ b/pkgs/tools/misc/hexd/default.nix @@ -3,7 +3,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "hexd-${version}"; + pname = "hexd"; version = "1.0.0"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/hhpc/default.nix b/pkgs/tools/misc/hhpc/default.nix index b4ee1f2f5c0..4b1b0d0c762 100644 --- a/pkgs/tools/misc/hhpc/default.nix +++ b/pkgs/tools/misc/hhpc/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchFromGitHub, xorg, pkgconfig}: stdenv.mkDerivation rec { - name = "hhpc-${version}"; + pname = "hhpc"; version = "0.3.1"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/hostsblock/default.nix b/pkgs/tools/misc/hostsblock/default.nix index a0fcc6074dc..61832a5d326 100644 --- a/pkgs/tools/misc/hostsblock/default.nix +++ b/pkgs/tools/misc/hostsblock/default.nix @@ -20,7 +20,7 @@ ] }: stdenv.mkDerivation rec { - name = "hostsblock-${version}"; + pname = "hostsblock"; version = "20161213"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/hpl/default.nix b/pkgs/tools/misc/hpl/default.nix index d9aaefb46d9..16bc0393f23 100644 --- a/pkgs/tools/misc/hpl/default.nix +++ b/pkgs/tools/misc/hpl/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, openblasCompat, mpi } : stdenv.mkDerivation rec { - name = "hpl-${version}"; + pname = "hpl"; version = "2.3"; src = fetchurl { - url = "http://www.netlib.org/benchmark/hpl/${name}.tar.gz"; + url = "http://www.netlib.org/benchmark/hpl/${pname}-${version}.tar.gz"; sha256 = "0c18c7fzlqxifz1bf3izil0bczv3a7nsv0dn6winy3ik49yw3i9j"; }; diff --git a/pkgs/tools/misc/i3cat/default.nix b/pkgs/tools/misc/i3cat/default.nix index 7035f2ecedf..bc934c424f3 100644 --- a/pkgs/tools/misc/i3cat/default.nix +++ b/pkgs/tools/misc/i3cat/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { - name = "i3cat-${version}"; + pname = "i3cat"; version = "20150321-${stdenv.lib.strings.substring 0 7 rev}"; rev = "b9ba886a7c769994ccd8d4627978ef4b51fcf576"; diff --git a/pkgs/tools/misc/i3minator/default.nix b/pkgs/tools/misc/i3minator/default.nix index 898ecd9df4a..372eebb59f6 100644 --- a/pkgs/tools/misc/i3minator/default.nix +++ b/pkgs/tools/misc/i3minator/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, pythonPackages, glibcLocales }: pythonPackages.buildPythonApplication rec { - name = "i3minator-${version}"; + pname = "i3minator"; version = "0.0.4"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/ical2org/default.nix b/pkgs/tools/misc/ical2org/default.nix index 141fc968a2d..872de2c702b 100644 --- a/pkgs/tools/misc/ical2org/default.nix +++ b/pkgs/tools/misc/ical2org/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, buildGoPackage}: buildGoPackage rec { - name = "ical2org-${version}"; + pname = "ical2org"; version="1.1.5"; goPackagePath = "github.com/rjhorniii/ical2org"; diff --git a/pkgs/tools/misc/ideviceinstaller/default.nix b/pkgs/tools/misc/ideviceinstaller/default.nix index 15af413a999..98b039e3f8a 100644 --- a/pkgs/tools/misc/ideviceinstaller/default.nix +++ b/pkgs/tools/misc/ideviceinstaller/default.nix @@ -4,8 +4,6 @@ stdenv.mkDerivation rec { pname = "ideviceinstaller"; version = "2018-10-01"; - name = "${pname}-${version}"; - src = fetchFromGitHub { owner = "libimobiledevice"; repo = pname; diff --git a/pkgs/tools/misc/ifdtool/default.nix b/pkgs/tools/misc/ifdtool/default.nix index 7d15825c27e..7fe4ad86b8e 100644 --- a/pkgs/tools/misc/ifdtool/default.nix +++ b/pkgs/tools/misc/ifdtool/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "ifdtool-${version}"; + pname = "ifdtool"; version = "4.9"; src = fetchurl { diff --git a/pkgs/tools/misc/intelmetool/default.nix b/pkgs/tools/misc/intelmetool/default.nix index 66378e457a2..87aa7df8d6d 100644 --- a/pkgs/tools/misc/intelmetool/default.nix +++ b/pkgs/tools/misc/intelmetool/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, zlib, pciutils }: stdenv.mkDerivation rec { - name = "intelmetool-${version}"; + pname = "intelmetool"; version = "4.8.1"; src = fetchgit { diff --git a/pkgs/tools/misc/ipad_charge/default.nix b/pkgs/tools/misc/ipad_charge/default.nix index caefcb835a3..981d9f2dc6c 100644 --- a/pkgs/tools/misc/ipad_charge/default.nix +++ b/pkgs/tools/misc/ipad_charge/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, libusb1 }: stdenv.mkDerivation rec { - name = "ipad_charge-${version}"; + pname = "ipad_charge"; version = "2015-02-03"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/ised/default.nix b/pkgs/tools/misc/ised/default.nix index a87d199d9bd..3529324b30a 100644 --- a/pkgs/tools/misc/ised/default.nix +++ b/pkgs/tools/misc/ised/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "ised-${version}"; + pname = "ised"; version = "2.7.1"; src = fetchurl { - url = "mirror://sourceforge/project/ised/${name}.tar.bz2"; + url = "mirror://sourceforge/project/ised/${pname}-${version}.tar.bz2"; sha256 = "0fhha61whkkqranqdxg792g0f5kgp5m3m6z1iqcvjh2c34rczbmb"; }; diff --git a/pkgs/tools/misc/jdupes/default.nix b/pkgs/tools/misc/jdupes/default.nix index d82347fef8f..bf1501155d9 100644 --- a/pkgs/tools/misc/jdupes/default.nix +++ b/pkgs/tools/misc/jdupes/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "jdupes-${version}"; + pname = "jdupes"; version = "1.13.2"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/keychain/default.nix b/pkgs/tools/misc/keychain/default.nix index 208c04ff039..c19ed50ece2 100644 --- a/pkgs/tools/misc/keychain/default.nix +++ b/pkgs/tools/misc/keychain/default.nix @@ -2,7 +2,7 @@ , perl, procps, gnugrep, gawk, findutils, gnused }: stdenv.mkDerivation rec { - name = "keychain-${version}"; + pname = "keychain"; version = "2.8.5"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/kt/default.nix b/pkgs/tools/misc/kt/default.nix index be0ceda511c..c272584e2c0 100644 --- a/pkgs/tools/misc/kt/default.nix +++ b/pkgs/tools/misc/kt/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, buildGoPackage }: buildGoPackage rec { - name = "kt-${version}"; + pname = "kt"; version = "12.1.0"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/latex2html/default.nix b/pkgs/tools/misc/latex2html/default.nix index b7963c3ed81..2ca99eb61e8 100644 --- a/pkgs/tools/misc/latex2html/default.nix +++ b/pkgs/tools/misc/latex2html/default.nix @@ -6,7 +6,7 @@ # https://github.com/Homebrew/homebrew-core/blob/21834573f690407d34b0bbf4250b82ec38dda4d6/Formula/latex2html.rb stdenv.mkDerivation rec { - name = "latex2html-${version}"; + pname = "latex2html"; version = "2018"; src = fetchurl { diff --git a/pkgs/tools/misc/ldapvi/default.nix b/pkgs/tools/misc/ldapvi/default.nix index 72c9cecf540..5955c1104d3 100644 --- a/pkgs/tools/misc/ldapvi/default.nix +++ b/pkgs/tools/misc/ldapvi/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, openldap, openssl, popt, glib, ncurses, readline, pkgconfig, cyrus_sasl, autoconf, automake }: stdenv.mkDerivation rec { - name = "ldapvi-${version}"; + pname = "ldapvi"; version = "0lz1sb5r0y9ypy8d7hm0l2wfa8l69f8ll0i5c78c0apz40nyjqkg"; # use latest git, it includes some important patches since 2007 release diff --git a/pkgs/tools/misc/ldmtool/default.nix b/pkgs/tools/misc/ldmtool/default.nix index c6b544f9e0a..b59c46a8477 100644 --- a/pkgs/tools/misc/ldmtool/default.nix +++ b/pkgs/tools/misc/ldmtool/default.nix @@ -2,7 +2,7 @@ libtool, readline, gobject-introspection, json-glib, lvm2, libxslt, docbook_xsl }: stdenv.mkDerivation rec { - name = "ldmtool-${version}"; + pname = "ldmtool"; version = "0.2.4"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/lf/default.nix b/pkgs/tools/misc/lf/default.nix index 95f88654425..61e115e71eb 100644 --- a/pkgs/tools/misc/lf/default.nix +++ b/pkgs/tools/misc/lf/default.nix @@ -1,7 +1,7 @@ { buildGoModule, fetchFromGitHub, lib }: buildGoModule rec { - name = "lf-${version}"; + pname = "lf"; version = "13"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/libcpuid/default.nix b/pkgs/tools/misc/libcpuid/default.nix index 8c9db5b8a77..e31112a74d8 100644 --- a/pkgs/tools/misc/libcpuid/default.nix +++ b/pkgs/tools/misc/libcpuid/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { - name = "libcpuid-${version}"; + pname = "libcpuid"; version = "0.4.1"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/linuxquota/default.nix b/pkgs/tools/misc/linuxquota/default.nix index d489a5188f1..9bc7c372d93 100644 --- a/pkgs/tools/misc/linuxquota/default.nix +++ b/pkgs/tools/misc/linuxquota/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "4.05"; - name = "quota-${version}"; + pname = "quota"; src = fetchurl { url = "mirror://sourceforge/linuxquota/quota-${version}.tar.gz"; diff --git a/pkgs/tools/misc/logstash/5.x.nix b/pkgs/tools/misc/logstash/5.x.nix index 7834bc96bef..2545dd1e6bc 100644 --- a/pkgs/tools/misc/logstash/5.x.nix +++ b/pkgs/tools/misc/logstash/5.x.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = elk5Version; - name = "logstash-${version}"; + pname = "logstash"; src = fetchurl { - url = "https://artifacts.elastic.co/downloads/logstash/${name}.tar.gz"; + url = "https://artifacts.elastic.co/downloads/logstash/${pname}-${version}.tar.gz"; sha256 = "0sax9p2bwjdrcvkm1mgvljdjn2qkyjd5i8rzajdn3n98gqin1la0"; }; diff --git a/pkgs/tools/misc/logstash/contrib.nix b/pkgs/tools/misc/logstash/contrib.nix index dc33d2ece54..b580d559868 100644 --- a/pkgs/tools/misc/logstash/contrib.nix +++ b/pkgs/tools/misc/logstash/contrib.nix @@ -4,7 +4,7 @@ # $path/logstash/{inputs,codecs,filters,outputs}/*.rb stdenv.mkDerivation rec { version = "1.4.2"; - name = "logstash-contrib-${version}"; + pname = "logstash-contrib"; src = fetchzip { url = "https://download.elasticsearch.org/logstash/logstash/logstash-contrib-${version}.tar.gz"; diff --git a/pkgs/tools/misc/ltunify/default.nix b/pkgs/tools/misc/ltunify/default.nix index cb594391e2a..4521f8b407a 100644 --- a/pkgs/tools/misc/ltunify/default.nix +++ b/pkgs/tools/misc/ltunify/default.nix @@ -4,7 +4,7 @@ # adding this to services.udev.packages on NixOS stdenv.mkDerivation rec { - name = "ltunify-${version}"; + pname = "ltunify"; version = "unstable-20180330"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/mandoc/default.nix b/pkgs/tools/misc/mandoc/default.nix index 9ddd9218801..828e2358236 100644 --- a/pkgs/tools/misc/mandoc/default.nix +++ b/pkgs/tools/misc/mandoc/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, zlib }: stdenv.mkDerivation rec { - name = "mandoc-${version}"; + pname = "mandoc"; version = "1.14.5"; src = fetchurl { diff --git a/pkgs/tools/misc/massren/default.nix b/pkgs/tools/misc/massren/default.nix index e2ff4868c9e..6d198a35605 100644 --- a/pkgs/tools/misc/massren/default.nix +++ b/pkgs/tools/misc/massren/default.nix @@ -1,7 +1,7 @@ { lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "massren-${version}"; + pname = "massren"; version = "1.5.4"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/mbuffer/default.nix b/pkgs/tools/misc/mbuffer/default.nix index 59ed474e9bc..44b00adf5c1 100644 --- a/pkgs/tools/misc/mbuffer/default.nix +++ b/pkgs/tools/misc/mbuffer/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { version = "20190725"; - name = "mbuffer-${version}"; + pname = "mbuffer"; src = fetchurl { url = "http://www.maier-komor.de/software/mbuffer/mbuffer-${version}.tgz"; diff --git a/pkgs/tools/misc/mc/default.nix b/pkgs/tools/misc/mc/default.nix index 7f0cdac1dbf..b2711903ead 100644 --- a/pkgs/tools/misc/mc/default.nix +++ b/pkgs/tools/misc/mc/default.nix @@ -2,11 +2,11 @@ , libX11, libICE, perl, zip, unzip, gettext, slang, libssh2, openssl}: stdenv.mkDerivation rec { - name = "mc-${version}"; + pname = "mc"; version = "4.8.23"; src = fetchurl { - url = "http://www.midnight-commander.org/downloads/${name}.tar.xz"; + url = "http://www.midnight-commander.org/downloads/${pname}-${version}.tar.xz"; sha256 = "077z7phzq3m1sxyz7li77lyzv4rjmmh3wp2vy86pnc4387kpqzyx"; }; diff --git a/pkgs/tools/misc/mcrypt/default.nix b/pkgs/tools/misc/mcrypt/default.nix index 52c96fda197..bc520c57a33 100644 --- a/pkgs/tools/misc/mcrypt/default.nix +++ b/pkgs/tools/misc/mcrypt/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "2.6.8"; - name = "mcrypt-${version}"; + pname = "mcrypt"; src = fetchurl { - url = "mirror://sourceforge/mcrypt/MCrypt/${version}/${name}.tar.gz"; + url = "mirror://sourceforge/mcrypt/MCrypt/${version}/${pname}-${version}.tar.gz"; sha256 = "5145aa844e54cca89ddab6fb7dd9e5952811d8d787c4f4bf27eb261e6c182098"; }; diff --git a/pkgs/tools/misc/megacli/default.nix b/pkgs/tools/misc/megacli/default.nix index bbd78feaaf8..5121491625f 100644 --- a/pkgs/tools/misc/megacli/default.nix +++ b/pkgs/tools/misc/megacli/default.nix @@ -1,7 +1,7 @@ { stdenv, rpmextract, ncurses5, patchelf, requireFile, unzip }: stdenv.mkDerivation rec { - name = "megacli-${version}"; + pname = "megacli"; version = "8.07.14"; src = diff --git a/pkgs/tools/misc/mht2htm/default.nix b/pkgs/tools/misc/mht2htm/default.nix index 4f6c4bad97c..e382db0b92c 100644 --- a/pkgs/tools/misc/mht2htm/default.nix +++ b/pkgs/tools/misc/mht2htm/default.nix @@ -4,7 +4,7 @@ let date = "07.apr.2016"; in stdenv.mkDerivation rec { - name = "mht2mht-${version}"; + pname = "mht2mht"; version = "1.8.1.35"; src = fetchurl { diff --git a/pkgs/tools/misc/minicom/default.nix b/pkgs/tools/misc/minicom/default.nix index 3c2ed135225..3e23e2bddcc 100644 --- a/pkgs/tools/misc/minicom/default.nix +++ b/pkgs/tools/misc/minicom/default.nix @@ -2,7 +2,7 @@ , lrzsz, ncurses, libiconv }: stdenv.mkDerivation rec { - name = "minicom-${version}"; + pname = "minicom"; version = "2.7.1"; # The repository isn't tagged properly, so we need to use commit refs diff --git a/pkgs/tools/misc/ministat/default.nix b/pkgs/tools/misc/ministat/default.nix index 7b9549a80fe..7b8b8a82b72 100644 --- a/pkgs/tools/misc/ministat/default.nix +++ b/pkgs/tools/misc/ministat/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit }: stdenv.mkDerivation rec { - name = "ministat-${version}"; + pname = "ministat"; version = "20150715-1"; src = fetchgit { diff --git a/pkgs/tools/misc/mktorrent/default.nix b/pkgs/tools/misc/mktorrent/default.nix index da1e8be7cf4..b2f7fdf2a90 100644 --- a/pkgs/tools/misc/mktorrent/default.nix +++ b/pkgs/tools/misc/mktorrent/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchFromGitHub, openssl}: stdenv.mkDerivation rec { - name = "mktorrent-${version}"; + pname = "mktorrent"; version = "1.1"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/mlocate/default.nix b/pkgs/tools/misc/mlocate/default.nix index baf418ac9f0..f8fb253af47 100644 --- a/pkgs/tools/misc/mlocate/default.nix +++ b/pkgs/tools/misc/mlocate/default.nix @@ -3,11 +3,11 @@ let dbfile = stdenv.lib.attrByPath [ "locate" "dbfile" ] "/var/cache/locatedb" config; in stdenv.mkDerivation rec { - name = "mlocate-${version}"; + pname = "mlocate"; version = "0.26"; src = fetchurl { - url = "https://releases.pagure.org/mlocate/${name}.tar.xz"; + url = "https://releases.pagure.org/mlocate/${pname}-${version}.tar.xz"; sha256 = "0gi6y52gkakhhlnzy0p6izc36nqhyfx5830qirhvk3qrzrwxyqrh"; }; diff --git a/pkgs/tools/misc/mmake/default.nix b/pkgs/tools/misc/mmake/default.nix index 1d3a355dd95..a791cbe5d48 100644 --- a/pkgs/tools/misc/mmake/default.nix +++ b/pkgs/tools/misc/mmake/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "mmake-${version}"; + pname = "mmake"; version = "1.2.0"; goPackagePath = "github.com/tj/mmake"; diff --git a/pkgs/tools/misc/mmv/default.nix b/pkgs/tools/misc/mmv/default.nix index 602c9c26c78..6129f15c734 100644 --- a/pkgs/tools/misc/mmv/default.nix +++ b/pkgs/tools/misc/mmv/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "mmv-${version}"; + pname = "mmv"; version = "1.01b"; src = fetchurl { diff --git a/pkgs/tools/misc/mongodb-tools/default.nix b/pkgs/tools/misc/mongodb-tools/default.nix index a728450d76e..dc7a64bdcf7 100644 --- a/pkgs/tools/misc/mongodb-tools/default.nix +++ b/pkgs/tools/misc/mongodb-tools/default.nix @@ -10,7 +10,7 @@ in with stdenv.lib; buildGoPackage rec { - name = "mongo-tools-${version}"; + pname = "mongo-tools"; version = "3.7.2"; rev = "r${version}"; diff --git a/pkgs/tools/misc/moreutils/default.nix b/pkgs/tools/misc/moreutils/default.nix index 00cbc8b4629..336d673f7ec 100644 --- a/pkgs/tools/misc/moreutils/default.nix +++ b/pkgs/tools/misc/moreutils/default.nix @@ -2,7 +2,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "moreutils-${version}"; + pname = "moreutils"; version = "0.63"; src = fetchgit { diff --git a/pkgs/tools/misc/mpdscribble/default.nix b/pkgs/tools/misc/mpdscribble/default.nix index 5be323a6f4b..df84084fc9c 100644 --- a/pkgs/tools/misc/mpdscribble/default.nix +++ b/pkgs/tools/misc/mpdscribble/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, mpd_clientlib, curl, glib, pkgconfig }: stdenv.mkDerivation rec { - name = "mpdscribble-${version}"; + pname = "mpdscribble"; version = "0.22"; src = fetchurl { diff --git a/pkgs/tools/misc/mprime/default.nix b/pkgs/tools/misc/mprime/default.nix index 778671f0b54..363e90ab5f2 100644 --- a/pkgs/tools/misc/mprime/default.nix +++ b/pkgs/tools/misc/mprime/default.nix @@ -15,7 +15,7 @@ let in stdenv.mkDerivation rec { - name = "mprime-${version}"; + pname = "mprime"; version = "29.4b7"; src = fetchurl { diff --git a/pkgs/tools/misc/mrtg/default.nix b/pkgs/tools/misc/mrtg/default.nix index 26fcea669c2..922592a256d 100644 --- a/pkgs/tools/misc/mrtg/default.nix +++ b/pkgs/tools/misc/mrtg/default.nix @@ -3,10 +3,10 @@ stdenv.mkDerivation rec { version = "2.17.7"; - name = "mrtg-${version}"; + pname = "mrtg"; src = fetchurl { - url = "https://oss.oetiker.ch/mrtg/pub/${name}.tar.gz"; + url = "https://oss.oetiker.ch/mrtg/pub/${pname}-${version}.tar.gz"; sha256 = "1hrjqfi290i936nblwpfzjn6v8d8p69frcrvml206nxiiwkcp54v"; }; diff --git a/pkgs/tools/misc/ms-sys/default.nix b/pkgs/tools/misc/ms-sys/default.nix index 04271b61069..2607cf6f300 100644 --- a/pkgs/tools/misc/ms-sys/default.nix +++ b/pkgs/tools/misc/ms-sys/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, gettext }: stdenv.mkDerivation rec { - name = "ms-sys-${version}"; + pname = "ms-sys"; version = "2.6.0"; src = fetchurl { - url = "mirror://sourceforge/ms-sys/${name}.tar.gz"; + url = "mirror://sourceforge/ms-sys/${pname}-${version}.tar.gz"; sha256 = "06xqpm2s9cg8fj7a1822wmh3p4arii0sifssazg1gr6i7xg7kbjz"; }; diff --git a/pkgs/tools/misc/multitail/default.nix b/pkgs/tools/misc/multitail/default.nix index 07561d390cd..3037b672498 100644 --- a/pkgs/tools/misc/multitail/default.nix +++ b/pkgs/tools/misc/multitail/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "6.4.2"; - name = "multitail-${version}"; + pname = "multitail"; src = fetchurl { - url = "https://www.vanheusden.com/multitail/${name}.tgz"; + url = "https://www.vanheusden.com/multitail/${pname}-${version}.tgz"; sha256 = "1zd1r89xkxngl1pdrvsc877838nwkfqkbcgfqm3vglwalxc587dg"; }; diff --git a/pkgs/tools/misc/mysqltuner/default.nix b/pkgs/tools/misc/mysqltuner/default.nix index 9c483fe3b8f..183871c39a7 100644 --- a/pkgs/tools/misc/mysqltuner/default.nix +++ b/pkgs/tools/misc/mysqltuner/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, perl }: stdenv.mkDerivation rec { - name = "mysqltuner-${version}"; + pname = "mysqltuner"; version = "1.7.13"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/nagstamon/default.nix b/pkgs/tools/misc/nagstamon/default.nix index 57036acb58e..525c16b6024 100644 --- a/pkgs/tools/misc/nagstamon/default.nix +++ b/pkgs/tools/misc/nagstamon/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pythonPackages }: pythonPackages.buildPythonApplication rec { - name = "nagstamon-${version}"; + pname = "nagstamon"; version = "3.2.1"; src = fetchurl { diff --git a/pkgs/tools/misc/nbench/default.nix b/pkgs/tools/misc/nbench/default.nix index 2312ce236ab..a1a6347642b 100644 --- a/pkgs/tools/misc/nbench/default.nix +++ b/pkgs/tools/misc/nbench/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "nbench-byte-${version}"; + pname = "nbench-byte"; version = "2.2.3"; src = fetchurl { - url = "http://www.math.utah.edu/~mayer/linux/${name}.tar.gz"; + url = "http://www.math.utah.edu/~mayer/linux/${pname}-${version}.tar.gz"; sha256 = "1b01j7nmm3wd92ngvsmn2sbw43sl9fpx4xxmkrink68fz1rx0gbj"; }; diff --git a/pkgs/tools/misc/ncdu/default.nix b/pkgs/tools/misc/ncdu/default.nix index bb792451564..97842f82ae9 100644 --- a/pkgs/tools/misc/ncdu/default.nix +++ b/pkgs/tools/misc/ncdu/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ncurses }: stdenv.mkDerivation rec { - name = "ncdu-${version}"; + pname = "ncdu"; version = "1.14"; src = fetchurl { - url = "https://dev.yorhel.nl/download/${name}.tar.gz"; + url = "https://dev.yorhel.nl/download/${pname}-${version}.tar.gz"; sha256 = "0i4cap2z3037xx2rdzhrlazl2igk3xy4ncddp9j7xqi1mcx7i566"; }; diff --git a/pkgs/tools/misc/neofetch/default.nix b/pkgs/tools/misc/neofetch/default.nix index 18ae88547a0..9d1357f5d2c 100644 --- a/pkgs/tools/misc/neofetch/default.nix +++ b/pkgs/tools/misc/neofetch/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "neofetch-${version}"; + pname = "neofetch"; version = "6.0.0"; src = fetchFromGitHub { owner = "dylanaraps"; diff --git a/pkgs/tools/misc/nginx-config-formatter/default.nix b/pkgs/tools/misc/nginx-config-formatter/default.nix index e19eac1c51e..91dd56c9b0f 100644 --- a/pkgs/tools/misc/nginx-config-formatter/default.nix +++ b/pkgs/tools/misc/nginx-config-formatter/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "2019-02-13"; - name = "nginx-config-formatter-${version}"; + pname = "nginx-config-formatter"; src = fetchFromGitHub { owner = "1connect"; diff --git a/pkgs/tools/misc/nms/default.nix b/pkgs/tools/misc/nms/default.nix index 3037262322f..0005ffe824b 100644 --- a/pkgs/tools/misc/nms/default.nix +++ b/pkgs/tools/misc/nms/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "nms-${version}"; + pname = "nms"; version = "0.3.3"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/noteshrink/default.nix b/pkgs/tools/misc/noteshrink/default.nix index 77c84ab4511..b197e9bc5d2 100644 --- a/pkgs/tools/misc/noteshrink/default.nix +++ b/pkgs/tools/misc/noteshrink/default.nix @@ -3,7 +3,7 @@ with python3.pkgs; buildPythonApplication rec { - name = "noteshrink-${version}"; + pname = "noteshrink"; version = "0.1.1"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/noti/default.nix b/pkgs/tools/misc/noti/default.nix index 23646abe787..bfe674d2f5c 100644 --- a/pkgs/tools/misc/noti/default.nix +++ b/pkgs/tools/misc/noti/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub, Cocoa }: buildGoPackage rec { - name = "noti-${version}"; + pname = "noti"; version = "3.1.0"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/notify-desktop/default.nix b/pkgs/tools/misc/notify-desktop/default.nix index 93c0f5e346b..307a08bbdf9 100644 --- a/pkgs/tools/misc/notify-desktop/default.nix +++ b/pkgs/tools/misc/notify-desktop/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, dbus, pkgconfig }: stdenv.mkDerivation rec { - name = "notify-desktop-${version}"; + pname = "notify-desktop"; version = "0.2.0"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/nvramtool/default.nix b/pkgs/tools/misc/nvramtool/default.nix index fdce7076661..ecff547e951 100644 --- a/pkgs/tools/misc/nvramtool/default.nix +++ b/pkgs/tools/misc/nvramtool/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, iasl, flex, bison }: stdenv.mkDerivation rec { - name = "nvramtool-${version}"; + pname = "nvramtool"; version = "4.8.1"; src = fetchgit { diff --git a/pkgs/tools/misc/oci-image-tool/default.nix b/pkgs/tools/misc/oci-image-tool/default.nix index 6d508a48901..3b45b7b0644 100644 --- a/pkgs/tools/misc/oci-image-tool/default.nix +++ b/pkgs/tools/misc/oci-image-tool/default.nix @@ -1,7 +1,7 @@ { lib, fetchFromGitHub, buildGoPackage }: buildGoPackage rec { - name = "oci-image-tool-${version}"; + pname = "oci-image-tool"; version = "1.0.0-rc1"; goPackagePath = "github.com/opencontainers/image-tools"; diff --git a/pkgs/tools/misc/ocz-ssd-guru/default.nix b/pkgs/tools/misc/ocz-ssd-guru/default.nix index 9ffb89aca6b..4317c46190d 100644 --- a/pkgs/tools/misc/ocz-ssd-guru/default.nix +++ b/pkgs/tools/misc/ocz-ssd-guru/default.nix @@ -4,7 +4,7 @@ let system = if stdenv.hostPlatform.system == "x86_64-linux" then "linux64" else "linux32"; in stdenv.mkDerivation rec { - name = "ocz-ssd-guru-${version}"; + pname = "ocz-ssd-guru"; version = "1.0.1170"; src = fetchurl { diff --git a/pkgs/tools/misc/opentsdb/default.nix b/pkgs/tools/misc/opentsdb/default.nix index f6aea4a92ab..2a0846dd511 100644 --- a/pkgs/tools/misc/opentsdb/default.nix +++ b/pkgs/tools/misc/opentsdb/default.nix @@ -5,11 +5,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "opentsdb-${version}"; + pname = "opentsdb"; version = "2.3.1"; src = fetchurl { - url = "https://github.com/OpenTSDB/opentsdb/releases/download/v${version}/${name}.tar.gz"; + url = "https://github.com/OpenTSDB/opentsdb/releases/download/v${version}/${pname}-${version}.tar.gz"; sha256 = "1lf1gynr11silla4bsrkwqv023dxirsb88ncs2qmc2ng35593fjd"; }; diff --git a/pkgs/tools/misc/os-prober/default.nix b/pkgs/tools/misc/os-prober/default.nix index 59a60e356b8..78426329975 100644 --- a/pkgs/tools/misc/os-prober/default.nix +++ b/pkgs/tools/misc/os-prober/default.nix @@ -10,7 +10,7 @@ ntfs3g # ntfs3g stdenv.mkDerivation rec { version = "1.76"; - name = "os-prober-${version}"; + pname = "os-prober"; src = fetchurl { url = "https://salsa.debian.org/philh/os-prober/-/archive/${version}/os-prober-${version}.tar.bz2"; sha256 = "07rw3092pckh21vx6y4hzqcn3wn4cqmwxaaiq100lncnhmszg11g"; diff --git a/pkgs/tools/misc/osm2pgsql/default.nix b/pkgs/tools/misc/osm2pgsql/default.nix index f14fb526997..370d1924711 100644 --- a/pkgs/tools/misc/osm2pgsql/default.nix +++ b/pkgs/tools/misc/osm2pgsql/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, expat, proj, bzip2, zlib, boost, postgresql, lua}: stdenv.mkDerivation rec { - name = "osm2pgsql-${version}"; + pname = "osm2pgsql"; version = "0.96.0"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/otfcc/default.nix b/pkgs/tools/misc/otfcc/default.nix index 96e5e6a1d94..4b28a7c45e5 100644 --- a/pkgs/tools/misc/otfcc/default.nix +++ b/pkgs/tools/misc/otfcc/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, premake5 }: stdenv.mkDerivation rec { - name = "otfcc-${version}"; + pname = "otfcc"; version = "0.9.6"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/parcellite/default.nix b/pkgs/tools/misc/parcellite/default.nix index 1e747961499..5313b69933b 100644 --- a/pkgs/tools/misc/parcellite/default.nix +++ b/pkgs/tools/misc/parcellite/default.nix @@ -3,7 +3,7 @@ , which, wrapGAppsHook, xdotool }: stdenv.mkDerivation rec { - name = "parcellite-${version}"; + pname = "parcellite"; version = "1.2.1"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/pastebinit/default.nix b/pkgs/tools/misc/pastebinit/default.nix index a5e45dc259b..c2c8e2b8573 100644 --- a/pkgs/tools/misc/pastebinit/default.nix +++ b/pkgs/tools/misc/pastebinit/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "1.5"; - name = "pastebinit-${version}"; + pname = "pastebinit"; src = fetchurl { - url = "https://launchpad.net/pastebinit/trunk/${version}/+download/${name}.tar.bz2"; + url = "https://launchpad.net/pastebinit/trunk/${version}/+download/${pname}-${version}.tar.bz2"; sha256 = "0mw48fgm9lyh9d3pw997fccmglzsjccf2y347gxjas74wx6aira2"; }; diff --git a/pkgs/tools/misc/pb_cli/default.nix b/pkgs/tools/misc/pb_cli/default.nix index fe1d848ee50..858422b8532 100644 --- a/pkgs/tools/misc/pb_cli/default.nix +++ b/pkgs/tools/misc/pb_cli/default.nix @@ -6,7 +6,7 @@ assert video -> capture != null; assert clipboard -> xclip != null; stdenv.mkDerivation rec { - name = "pb_cli-unstable-${version}"; + pname = "pb_cli-unstable"; version = "2019-03-10"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/phoronix-test-suite/default.nix b/pkgs/tools/misc/phoronix-test-suite/default.nix index c16106f4637..6c1bc5fcf04 100644 --- a/pkgs/tools/misc/phoronix-test-suite/default.nix +++ b/pkgs/tools/misc/phoronix-test-suite/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, php, which, gnused, makeWrapper, gnumake, gcc }: stdenv.mkDerivation rec { - name = "phoronix-test-suite-${version}"; + pname = "phoronix-test-suite"; version = "8.8.1"; src = fetchurl { - url = "https://phoronix-test-suite.com/releases/${name}.tar.gz"; + url = "https://phoronix-test-suite.com/releases/${pname}-${version}.tar.gz"; sha256 = "1l5wnj5d652dg02j7iy7n9ab7qrpclmgvyxnh1s6cdnnnspyxznn"; }; diff --git a/pkgs/tools/misc/phraseapp-client/default.nix b/pkgs/tools/misc/phraseapp-client/default.nix index 74d24db574f..dd07fee3405 100644 --- a/pkgs/tools/misc/phraseapp-client/default.nix +++ b/pkgs/tools/misc/phraseapp-client/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "phraseapp-client-${version}"; + pname = "phraseapp-client"; version = "1.11.0"; goPackagePath = "github.com/phrase/phraseapp-client"; diff --git a/pkgs/tools/misc/pick/default.nix b/pkgs/tools/misc/pick/default.nix index 45b0da6f8db..ceb2bace7db 100644 --- a/pkgs/tools/misc/pick/default.nix +++ b/pkgs/tools/misc/pick/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, ncurses, pkgconfig }: stdenv.mkDerivation rec { - name = "pick-${version}"; + pname = "pick"; version = "2.0.2"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/picocom/default.nix b/pkgs/tools/misc/picocom/default.nix index c49695fd9ad..1ad21940368 100644 --- a/pkgs/tools/misc/picocom/default.nix +++ b/pkgs/tools/misc/picocom/default.nix @@ -5,7 +5,7 @@ assert stdenv.isDarwin -> IOKit != null; with stdenv.lib; stdenv.mkDerivation rec { - name = "picocom-${version}"; + pname = "picocom"; version = "3.1"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/pipelight/default.nix b/pkgs/tools/misc/pipelight/default.nix index abbd64cb62f..5bd1e347082 100644 --- a/pkgs/tools/misc/pipelight/default.nix +++ b/pkgs/tools/misc/pipelight/default.nix @@ -10,7 +10,7 @@ in stdenv.mkDerivation rec { version = "0.2.8.2"; - name = "pipelight-${version}"; + pname = "pipelight"; src = fetchurl { url = "https://bitbucket.org/mmueller2012/pipelight/get/v${version}.tar.gz"; diff --git a/pkgs/tools/misc/pixd/default.nix b/pkgs/tools/misc/pixd/default.nix index ececef39850..a16333f6e44 100644 --- a/pkgs/tools/misc/pixd/default.nix +++ b/pkgs/tools/misc/pixd/default.nix @@ -3,7 +3,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "pixd-${version}"; + pname = "pixd"; version = "1.0.0"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/plantuml/default.nix b/pkgs/tools/misc/plantuml/default.nix index 1cf64362e6d..eb2881b29f7 100644 --- a/pkgs/tools/misc/plantuml/default.nix +++ b/pkgs/tools/misc/plantuml/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.2019.8"; - name = "plantuml-${version}"; + pname = "plantuml"; src = fetchurl { url = "mirror://sourceforge/project/plantuml/${version}/plantuml.${version}.jar"; diff --git a/pkgs/tools/misc/plotinus/default.nix b/pkgs/tools/misc/plotinus/default.nix index 41913f96653..d2a7f3f37ea 100644 --- a/pkgs/tools/misc/plotinus/default.nix +++ b/pkgs/tools/misc/plotinus/default.nix @@ -10,7 +10,7 @@ , wrapGAppsHook }: stdenv.mkDerivation rec { - name = "plotinus-${version}"; + pname = "plotinus"; version = "0.2.0"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/plowshare/default.nix b/pkgs/tools/misc/plowshare/default.nix index 191f8980d83..1d3e8c6c33d 100644 --- a/pkgs/tools/misc/plowshare/default.nix +++ b/pkgs/tools/misc/plowshare/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { - name = "plowshare-${version}"; + pname = "plowshare"; version = "2.1.7"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/pod2mdoc/default.nix b/pkgs/tools/misc/pod2mdoc/default.nix index 0bd61c0fcdf..5712e02e8ea 100644 --- a/pkgs/tools/misc/pod2mdoc/default.nix +++ b/pkgs/tools/misc/pod2mdoc/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "pod2mdoc-${version}"; + pname = "pod2mdoc"; version = "0.0.10"; src = fetchurl { - url = "http://mdocml.bsd.lv/pod2mdoc/snapshots/${name}.tgz"; + url = "http://mdocml.bsd.lv/pod2mdoc/snapshots/${pname}-${version}.tgz"; sha256 = "0nwa9zv9gmfi5ysz1wfm60kahc7nv0133n3dfc2vh2y3gj8mxr4f"; }; diff --git a/pkgs/tools/misc/powerline-go/default.nix b/pkgs/tools/misc/powerline-go/default.nix index 2c9ed7be039..5c1b1be2db3 100644 --- a/pkgs/tools/misc/powerline-go/default.nix +++ b/pkgs/tools/misc/powerline-go/default.nix @@ -3,7 +3,6 @@ buildGoModule rec { pname = "powerline-go"; version = "1.13.0"; - name = "${pname}-${version}"; src = fetchFromGitHub { owner = "justjanne"; diff --git a/pkgs/tools/misc/profile-cleaner/default.nix b/pkgs/tools/misc/profile-cleaner/default.nix index 2a34224c126..0c9d3a0ea79 100644 --- a/pkgs/tools/misc/profile-cleaner/default.nix +++ b/pkgs/tools/misc/profile-cleaner/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "2.37"; - name = "profile-cleaner-${version}"; + pname = "profile-cleaner"; src = fetchFromGitHub { owner = "graysky2"; diff --git a/pkgs/tools/misc/profile-sync-daemon/default.nix b/pkgs/tools/misc/profile-sync-daemon/default.nix index ac98df58784..989a2d3f22b 100644 --- a/pkgs/tools/misc/profile-sync-daemon/default.nix +++ b/pkgs/tools/misc/profile-sync-daemon/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "6.34"; - name = "profile-sync-daemon-${version}"; + pname = "profile-sync-daemon"; src = fetchurl { url = "https://github.com/graysky2/profile-sync-daemon/archive/v${version}.tar.gz"; diff --git a/pkgs/tools/misc/progress/default.nix b/pkgs/tools/misc/progress/default.nix index b29d0eafcc9..3edca413f3a 100644 --- a/pkgs/tools/misc/progress/default.nix +++ b/pkgs/tools/misc/progress/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, pkgconfig, ncurses, which }: stdenv.mkDerivation rec { - name = "progress-${version}"; + pname = "progress"; version = "0.14"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/pspg/default.nix b/pkgs/tools/misc/pspg/default.nix index 1aaed4feafe..ca3016d1187 100644 --- a/pkgs/tools/misc/pspg/default.nix +++ b/pkgs/tools/misc/pspg/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, gnugrep, ncurses, pkgconfig, readline }: stdenv.mkDerivation rec { - name = "pspg-${version}"; + pname = "pspg"; version = "1.6.8"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/radeon-profile/default.nix b/pkgs/tools/misc/radeon-profile/default.nix index 6af33691a07..613ad263ed3 100644 --- a/pkgs/tools/misc/radeon-profile/default.nix +++ b/pkgs/tools/misc/radeon-profile/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { - name = "radeon-profile-${version}"; + pname = "radeon-profile"; version = "20170714"; nativeBuildInputs = [ qmake ]; diff --git a/pkgs/tools/misc/rcm/default.nix b/pkgs/tools/misc/rcm/default.nix index 11ac0fc1419..3d97874df7d 100644 --- a/pkgs/tools/misc/rcm/default.nix +++ b/pkgs/tools/misc/rcm/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "rcm-${version}"; + pname = "rcm"; version = "1.3.3"; src = fetchurl { diff --git a/pkgs/tools/misc/recoverjpeg/default.nix b/pkgs/tools/misc/recoverjpeg/default.nix index 484bb765c0d..88aff4f3c08 100644 --- a/pkgs/tools/misc/recoverjpeg/default.nix +++ b/pkgs/tools/misc/recoverjpeg/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, makeWrapper, python2, exif, imagemagick }: stdenv.mkDerivation rec { - name = "recoverjpeg-${version}"; + pname = "recoverjpeg"; version = "2.6.3"; src = fetchurl { - url = "https://www.rfc1149.net/download/recoverjpeg/${name}.tar.gz"; + url = "https://www.rfc1149.net/download/recoverjpeg/${pname}-${version}.tar.gz"; sha256 = "009jgxi8lvdp00dwfj0n4x5yqrf64x00xdkpxpwgl2v8wcqn56fv"; }; diff --git a/pkgs/tools/misc/rig/default.nix b/pkgs/tools/misc/rig/default.nix index ee7b2623b1d..627758e9c5e 100644 --- a/pkgs/tools/misc/rig/default.nix +++ b/pkgs/tools/misc/rig/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.11"; - name = "rig-${version}"; + pname = "rig"; src = fetchurl { url = "https://ayera.dl.sourceforge.net/project/rig/rig/${version}/rig-${version}.tar.gz"; diff --git a/pkgs/tools/misc/rlwrap/default.nix b/pkgs/tools/misc/rlwrap/default.nix index bd60e786036..af5bfedf203 100644 --- a/pkgs/tools/misc/rlwrap/default.nix +++ b/pkgs/tools/misc/rlwrap/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, readline }: stdenv.mkDerivation rec { - name = "rlwrap-${version}"; + pname = "rlwrap"; version = "0.43"; src = fetchurl { - url = "https://github.com/hanslub42/rlwrap/releases/download/v${version}/${name}.tar.gz"; + url = "https://github.com/hanslub42/rlwrap/releases/download/v${version}/${pname}-${version}.tar.gz"; sha256 = "0bzb7ylk2770iv59v2d0gypb21y2xn87m299s9rqm6rdi2vx11lf"; }; diff --git a/pkgs/tools/misc/rmlint/default.nix b/pkgs/tools/misc/rmlint/default.nix index 320edd83021..7b7fa9ce705 100644 --- a/pkgs/tools/misc/rmlint/default.nix +++ b/pkgs/tools/misc/rmlint/default.nix @@ -4,7 +4,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "rmlint-${version}"; + pname = "rmlint"; version = "2.8.0"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/rockbox-utility/default.nix b/pkgs/tools/misc/rockbox-utility/default.nix index 925bb199b27..232949b7dac 100644 --- a/pkgs/tools/misc/rockbox-utility/default.nix +++ b/pkgs/tools/misc/rockbox-utility/default.nix @@ -5,7 +5,7 @@ let inherit (stdenv.lib) getDev; in stdenv.mkDerivation rec { - name = "rockbox-utility-${version}"; + pname = "rockbox-utility"; version = "1.4.0"; src = fetchurl { diff --git a/pkgs/tools/misc/roundup/default.nix b/pkgs/tools/misc/roundup/default.nix index e24b1fce06e..7eebc194300 100644 --- a/pkgs/tools/misc/roundup/default.nix +++ b/pkgs/tools/misc/roundup/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, ronn, shocco }: stdenv.mkDerivation rec { - name = "roundup-${version}"; + pname = "roundup"; version = "0.0.6"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/routino/default.nix b/pkgs/tools/misc/routino/default.nix index 650ac9f660a..d852818b315 100644 --- a/pkgs/tools/misc/routino/default.nix +++ b/pkgs/tools/misc/routino/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, perl, zlib, bzip2 }: stdenv.mkDerivation rec { - name = "routino-${version}"; + pname = "routino"; version = "3.2"; src = fetchurl { - url = "https://routino.org/download/${name}.tgz"; + url = "https://routino.org/download/${pname}-${version}.tgz"; sha256 = "0lkmpi8gn7qf40cx93jcp7nxa9dfwi1d6rjrhcqbdymszzm33972"; }; diff --git a/pkgs/tools/misc/rw/default.nix b/pkgs/tools/misc/rw/default.nix index 345f26852dc..b6e53e46536 100644 --- a/pkgs/tools/misc/rw/default.nix +++ b/pkgs/tools/misc/rw/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "rw-${version}"; + pname = "rw"; version = "1.0"; src = fetchurl { diff --git a/pkgs/tools/misc/sam-ba/default.nix b/pkgs/tools/misc/sam-ba/default.nix index 2d1db4eb64c..acab41e8ff5 100644 --- a/pkgs/tools/misc/sam-ba/default.nix +++ b/pkgs/tools/misc/sam-ba/default.nix @@ -11,7 +11,7 @@ let in stdenv.mkDerivation rec { version = "2.16"; - name = "sam-ba-${version}"; + pname = "sam-ba"; src = fetchzip { url = "http://www.atmel.com/dyn/resources/prod_documents/sam-ba_${version}_linux.zip"; diff --git a/pkgs/tools/misc/scanmem/default.nix b/pkgs/tools/misc/scanmem/default.nix index bd760adecf7..65b7b47256a 100644 --- a/pkgs/tools/misc/scanmem/default.nix +++ b/pkgs/tools/misc/scanmem/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "0.17"; - name = "scanmem-${version}"; + pname = "scanmem"; src = fetchFromGitHub { owner = "scanmem"; diff --git a/pkgs/tools/misc/scfbuild/default.nix b/pkgs/tools/misc/scfbuild/default.nix index 1b7afdfbe9d..2ba3224a5f8 100644 --- a/pkgs/tools/misc/scfbuild/default.nix +++ b/pkgs/tools/misc/scfbuild/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonApplication, fetchFromGitHub, python, pyyaml, fonttools, fontforge }: buildPythonApplication rec { - name = "scfbuild-${version}"; + pname = "scfbuild"; version = "1.0.3"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/screen/default.nix b/pkgs/tools/misc/screen/default.nix index df1fcd89ac7..beeeb84aac9 100644 --- a/pkgs/tools/misc/screen/default.nix +++ b/pkgs/tools/misc/screen/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, fetchpatch, ncurses, utmp, pam ? null }: stdenv.mkDerivation rec { - name = "screen-${version}"; + pname = "screen"; version = "4.6.2"; src = fetchurl { - url = "mirror://gnu/screen/${name}.tar.gz"; + url = "mirror://gnu/screen/${pname}-${version}.tar.gz"; sha256 = "0fps0fsipfbh7c2cnp7rjw9n79j0ysq21mk8hzifa33a1r924s8v"; }; diff --git a/pkgs/tools/misc/screenfetch/default.nix b/pkgs/tools/misc/screenfetch/default.nix index a9cd9d75de8..883c2edd80a 100644 --- a/pkgs/tools/misc/screenfetch/default.nix +++ b/pkgs/tools/misc/screenfetch/default.nix @@ -19,7 +19,7 @@ let ])); in stdenv.mkDerivation rec { - name = "screenFetch-${version}"; + pname = "screenFetch"; version = "3.8.0"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/sdate/default.nix b/pkgs/tools/misc/sdate/default.nix index 23dccc0273d..742b25601c0 100644 --- a/pkgs/tools/misc/sdate/default.nix +++ b/pkgs/tools/misc/sdate/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, autoreconfHook }: stdenv.mkDerivation rec { - name = "sdate-${version}"; + pname = "sdate"; version = "0.5"; src = fetchurl { url = "https://github.com/ChristophBerg/sdate/archive/${version}.tar.gz"; diff --git a/pkgs/tools/misc/sdl-jstest/default.nix b/pkgs/tools/misc/sdl-jstest/default.nix index 6a2ed3bcb91..e821d5e4332 100644 --- a/pkgs/tools/misc/sdl-jstest/default.nix +++ b/pkgs/tools/misc/sdl-jstest/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, cmake, pkgconfig, SDL, SDL2, ncurses, docbook_xsl, git }: stdenv.mkDerivation rec { - name = "sdl-jstest-${version}"; + pname = "sdl-jstest"; version = "2018-06-15"; # Submodules diff --git a/pkgs/tools/misc/sl/default.nix b/pkgs/tools/misc/sl/default.nix index b45304a43c4..bb7586ee379 100644 --- a/pkgs/tools/misc/sl/default.nix +++ b/pkgs/tools/misc/sl/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, ncurses }: stdenv.mkDerivation rec { - name = "sl-${version}"; + pname = "sl"; version = "5.04"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/slop/default.nix b/pkgs/tools/misc/slop/default.nix index 6f7c9d3506b..65031c2a1fe 100644 --- a/pkgs/tools/misc/slop/default.nix +++ b/pkgs/tools/misc/slop/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "slop-${version}"; + pname = "slop"; version = "7.4"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/smenu/default.nix b/pkgs/tools/misc/smenu/default.nix index f5e1fd7b1b4..c6661ee62e4 100644 --- a/pkgs/tools/misc/smenu/default.nix +++ b/pkgs/tools/misc/smenu/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "0.9.15"; - name = "smenu-${version}"; + pname = "smenu"; src = fetchFromGitHub { owner = "p-gen"; diff --git a/pkgs/tools/misc/snapper/default.nix b/pkgs/tools/misc/snapper/default.nix index ac0b950a1da..5eba12285de 100644 --- a/pkgs/tools/misc/snapper/default.nix +++ b/pkgs/tools/misc/snapper/default.nix @@ -4,7 +4,7 @@ , lvm2, pam, python, utillinux }: stdenv.mkDerivation rec { - name = "snapper-${version}"; + pname = "snapper"; version = "0.8.3"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/sonota/default.nix b/pkgs/tools/misc/sonota/default.nix index de9366d1d0f..d111e0b2b71 100644 --- a/pkgs/tools/misc/sonota/default.nix +++ b/pkgs/tools/misc/sonota/default.nix @@ -12,7 +12,7 @@ let }; in buildPythonApplication rec { - name = "sonota-unstable-${version}"; + pname = "sonota-unstable"; version = "2018-10-07"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/staruml/default.nix b/pkgs/tools/misc/staruml/default.nix index 794c06b8044..e4e1adf2001 100644 --- a/pkgs/tools/misc/staruml/default.nix +++ b/pkgs/tools/misc/staruml/default.nix @@ -10,7 +10,7 @@ let in stdenv.mkDerivation rec { version = "2.8.1"; - name = "staruml-${version}"; + pname = "staruml"; src = if stdenv.hostPlatform.system == "i686-linux" then fetchurl { diff --git a/pkgs/tools/misc/subberthehut/default.nix b/pkgs/tools/misc/subberthehut/default.nix index e5cc5ad4198..e54dc3b3f2b 100644 --- a/pkgs/tools/misc/subberthehut/default.nix +++ b/pkgs/tools/misc/subberthehut/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, pkgconfig, xmlrpc_c, glib, zlib }: stdenv.mkDerivation rec { - name = "subberthehut-${version}"; + pname = "subberthehut"; version = "20"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/sutils/default.nix b/pkgs/tools/misc/sutils/default.nix index c96ac41fb26..8d42d2d823f 100644 --- a/pkgs/tools/misc/sutils/default.nix +++ b/pkgs/tools/misc/sutils/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "0.2"; - name = "sutils-${version}"; + pname = "sutils"; src = fetchFromGitHub { owner = "baskerville"; diff --git a/pkgs/tools/misc/svtplay-dl/default.nix b/pkgs/tools/misc/svtplay-dl/default.nix index 5502f2542f1..e7759199fb9 100644 --- a/pkgs/tools/misc/svtplay-dl/default.nix +++ b/pkgs/tools/misc/svtplay-dl/default.nix @@ -4,7 +4,7 @@ let inherit (python3Packages) python nose pycrypto pyyaml requests mock; in stdenv.mkDerivation rec { - name = "svtplay-dl-${version}"; + pname = "svtplay-dl"; version = "2.1"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/sweep-visualizer/default.nix b/pkgs/tools/misc/sweep-visualizer/default.nix index fd0a766f54e..0d1ebd70041 100644 --- a/pkgs/tools/misc/sweep-visualizer/default.nix +++ b/pkgs/tools/misc/sweep-visualizer/default.nix @@ -6,7 +6,7 @@ libudev0-shim }: stdenv.mkDerivation rec { - name = "sweep-visualizer-${version}"; + pname = "sweep-visualizer"; version = "0.15.0"; src = fetchurl { diff --git a/pkgs/tools/misc/system-config-printer/default.nix b/pkgs/tools/misc/system-config-printer/default.nix index 6750bbe8ae6..35259dada3d 100644 --- a/pkgs/tools/misc/system-config-printer/default.nix +++ b/pkgs/tools/misc/system-config-printer/default.nix @@ -7,11 +7,11 @@ }: stdenv.mkDerivation rec { - name = "system-config-printer-${version}"; + pname = "system-config-printer"; version = "1.5.11"; src = fetchurl { - url = "https://github.com/zdohnal/system-config-printer/releases/download/${version}/${name}.tar.xz"; + url = "https://github.com/zdohnal/system-config-printer/releases/download/${version}/${pname}-${version}.tar.xz"; sha256 = "1lq0q51bhanirpjjvvh4xiafi8hgpk8r32h0dj6dn3f32z8pib9q"; }; diff --git a/pkgs/tools/misc/systrayhelper/default.nix b/pkgs/tools/misc/systrayhelper/default.nix index 73e144d93aa..dd48156d456 100644 --- a/pkgs/tools/misc/systrayhelper/default.nix +++ b/pkgs/tools/misc/systrayhelper/default.nix @@ -1,7 +1,7 @@ { stdenv, pkgconfig, libappindicator-gtk3, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "systrayhelper-${version}"; + pname = "systrayhelper"; version = "0.0.4"; rev = "ded1f2ed4d30f6ca2c89a13db0bd3046c6d6d0f9"; diff --git a/pkgs/tools/misc/teleconsole/default.nix b/pkgs/tools/misc/teleconsole/default.nix index 2d3eb91250a..4cac9befe16 100644 --- a/pkgs/tools/misc/teleconsole/default.nix +++ b/pkgs/tools/misc/teleconsole/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "teleconsole-${version}"; + pname = "teleconsole"; version = "0.4.0"; goPackagePath = "github.com/gravitational/teleconsole"; diff --git a/pkgs/tools/misc/tewisay/default.nix b/pkgs/tools/misc/tewisay/default.nix index 2d713ae3821..d875b098ab5 100644 --- a/pkgs/tools/misc/tewisay/default.nix +++ b/pkgs/tools/misc/tewisay/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub, makeWrapper }: buildGoPackage rec { - name = "tewisay-unstable-${version}"; + pname = "tewisay-unstable"; version = "2017-04-14"; goPackagePath = "github.com/lucy/tewisay"; diff --git a/pkgs/tools/misc/texi2mdoc/default.nix b/pkgs/tools/misc/texi2mdoc/default.nix index 47216838476..abc25db2fa7 100644 --- a/pkgs/tools/misc/texi2mdoc/default.nix +++ b/pkgs/tools/misc/texi2mdoc/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "texi2mdoc-${version}"; + pname = "texi2mdoc"; version = "0.1.2"; src = fetchurl { - url = "http://mdocml.bsd.lv/texi2mdoc/snapshots/${name}.tgz"; + url = "http://mdocml.bsd.lv/texi2mdoc/snapshots/${pname}-${version}.tgz"; sha256 = "1zjb61ymwfkw6z5g0aqmsn6qpw895zdxv7fv3059gj3wqa3zsibs"; }; diff --git a/pkgs/tools/misc/thin-provisioning-tools/default.nix b/pkgs/tools/misc/thin-provisioning-tools/default.nix index 9b587c27154..2ca5dfb7758 100644 --- a/pkgs/tools/misc/thin-provisioning-tools/default.nix +++ b/pkgs/tools/misc/thin-provisioning-tools/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, expat, libaio, boost }: stdenv.mkDerivation rec { - name = "thin-provisioning-tools-${version}"; + pname = "thin-provisioning-tools"; version = "0.7.6"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/time/default.nix b/pkgs/tools/misc/time/default.nix index 8f297542a3c..bb6276f7065 100644 --- a/pkgs/tools/misc/time/default.nix +++ b/pkgs/tools/misc/time/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "time-${version}"; + pname = "time"; version = "1.9"; src = fetchurl { - url = "mirror://gnu/time/${name}.tar.gz"; + url = "mirror://gnu/time/${pname}-${version}.tar.gz"; sha256 = "07jj7cz6lc13iqrpgn81ivqh8rkm73p4rnivwgrrshk23v4g1b7v"; }; diff --git a/pkgs/tools/misc/tio/default.nix b/pkgs/tools/misc/tio/default.nix index ed26895fba6..3a8388280d6 100644 --- a/pkgs/tools/misc/tio/default.nix +++ b/pkgs/tools/misc/tio/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchzip, autoreconfHook }: stdenv.mkDerivation rec { - name = "tio-${version}"; + pname = "tio"; version = "1.32"; src = fetchzip { diff --git a/pkgs/tools/misc/tldr/default.nix b/pkgs/tools/misc/tldr/default.nix index fcd556c5596..d4ff9d8c844 100644 --- a/pkgs/tools/misc/tldr/default.nix +++ b/pkgs/tools/misc/tldr/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, curl, libzip, pkgconfig }: stdenv.mkDerivation rec { - name = "tldr-${version}"; + pname = "tldr"; version = "1.3.0"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/tlp/default.nix b/pkgs/tools/misc/tlp/default.nix index 6e431fdc98e..e5932d9e946 100644 --- a/pkgs/tools/misc/tlp/default.nix +++ b/pkgs/tools/misc/tlp/default.nix @@ -14,7 +14,7 @@ let ); in stdenv.mkDerivation rec { - name = "tlp-${version}"; + pname = "tlp"; version = "1.2.2"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/tmate/default.nix b/pkgs/tools/misc/tmate/default.nix index c87fe8bf446..420692c070c 100644 --- a/pkgs/tools/misc/tmate/default.nix +++ b/pkgs/tools/misc/tmate/default.nix @@ -2,7 +2,7 @@ , zlib, openssl, libevent, ncurses, ruby, msgpack, libssh }: stdenv.mkDerivation rec { - name = "tmate-${version}"; + pname = "tmate"; version = "2.3.0"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/togglesg-download/default.nix b/pkgs/tools/misc/togglesg-download/default.nix index 968ead6131b..fa024e58fa8 100644 --- a/pkgs/tools/misc/togglesg-download/default.nix +++ b/pkgs/tools/misc/togglesg-download/default.nix @@ -2,7 +2,7 @@ pythonPackages.buildPythonApplication rec { - name = "togglesg-download-git-${version}"; + pname = "togglesg-download-git"; version = "2017-12-07"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/toilet/default.nix b/pkgs/tools/misc/toilet/default.nix index 2729f6f8859..abc6933a777 100644 --- a/pkgs/tools/misc/toilet/default.nix +++ b/pkgs/tools/misc/toilet/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libcaca }: stdenv.mkDerivation rec { - name = "toilet-${version}"; + pname = "toilet"; version = "0.3"; src = fetchurl { - url = "http://caca.zoy.org/raw-attachment/wiki/toilet/${name}.tar.gz"; + url = "http://caca.zoy.org/raw-attachment/wiki/toilet/${pname}-${version}.tar.gz"; sha256 = "1pl118qb7g0frpgl9ps43w4sd0psjirpmq54yg1kqcclqcqbbm49"; }; diff --git a/pkgs/tools/misc/toybox/default.nix b/pkgs/tools/misc/toybox/default.nix index 4591c5ac5b5..be0c33fb6e5 100644 --- a/pkgs/tools/misc/toybox/default.nix +++ b/pkgs/tools/misc/toybox/default.nix @@ -6,7 +6,6 @@ }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "toybox"; version = "0.8.1"; diff --git a/pkgs/tools/misc/ttfautohint/default.nix b/pkgs/tools/misc/ttfautohint/default.nix index eed527da416..bfb97c22b1d 100644 --- a/pkgs/tools/misc/ttfautohint/default.nix +++ b/pkgs/tools/misc/ttfautohint/default.nix @@ -6,10 +6,10 @@ stdenv.mkDerivation rec { version = "1.8.3"; - name = "ttfautohint-${version}"; + pname = "ttfautohint"; src = fetchurl { - url = "mirror://savannah/freetype/${name}.tar.gz"; + url = "mirror://savannah/freetype/${pname}-${version}.tar.gz"; sha256 = "0zpqgihn3yh3v51ynxwr8asqrijvs4gv686clwv7bm8sawr4kfw7"; }; diff --git a/pkgs/tools/misc/ttwatch/default.nix b/pkgs/tools/misc/ttwatch/default.nix index 5663bcc35fd..59091bcd2bd 100644 --- a/pkgs/tools/misc/ttwatch/default.nix +++ b/pkgs/tools/misc/ttwatch/default.nix @@ -2,7 +2,7 @@ , enableUnsafe ? false }: stdenv.mkDerivation rec { - name = "ttwatch-${version}"; + pname = "ttwatch"; version = "2018-12-04"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/tty-clock/default.nix b/pkgs/tools/misc/tty-clock/default.nix index 113359a8bce..edaa9b662e7 100644 --- a/pkgs/tools/misc/tty-clock/default.nix +++ b/pkgs/tools/misc/tty-clock/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, ncurses, pkgconfig }: stdenv.mkDerivation rec { - name = "tty-clock-${version}"; + pname = "tty-clock"; version = "2.3"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/ttylog/default.nix b/pkgs/tools/misc/ttylog/default.nix index fda9dc506e2..70856fba731 100644 --- a/pkgs/tools/misc/ttylog/default.nix +++ b/pkgs/tools/misc/ttylog/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { - name = "ttylog-${version}"; + pname = "ttylog"; version = "0.31"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/ttyplot/default.nix b/pkgs/tools/misc/ttyplot/default.nix index 78aeab00a50..45aa9ea5c0b 100644 --- a/pkgs/tools/misc/ttyplot/default.nix +++ b/pkgs/tools/misc/ttyplot/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, ncurses }: stdenv.mkDerivation rec { - name = "ttyplot-${version}"; + pname = "ttyplot"; version = "1.4"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/ttyrec/default.nix b/pkgs/tools/misc/ttyrec/default.nix index ca665171811..56ec9afea43 100644 --- a/pkgs/tools/misc/ttyrec/default.nix +++ b/pkgs/tools/misc/ttyrec/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "ttyrec-${version}"; + pname = "ttyrec"; version = "1.0.8"; src = fetchurl { - url = "http://0xcc.net/ttyrec/${name}.tar.gz"; + url = "http://0xcc.net/ttyrec/${pname}-${version}.tar.gz"; sha256 = "ef5e9bf276b65bb831f9c2554cd8784bd5b4ee65353808f82b7e2aef851587ec"; }; diff --git a/pkgs/tools/misc/txt2man/default.nix b/pkgs/tools/misc/txt2man/default.nix index f37892a231a..90f9559e6b7 100644 --- a/pkgs/tools/misc/txt2man/default.nix +++ b/pkgs/tools/misc/txt2man/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, coreutils, gawk }: stdenv.mkDerivation rec { - name = "txt2man-${version}"; + pname = "txt2man"; version = "1.6.0"; src = fetchurl { - url = "https://github.com/mvertes/txt2man/archive/${name}.tar.gz"; + url = "https://github.com/mvertes/txt2man/archive/${pname}-${version}.tar.gz"; sha256 = "168cj96974n2z0igin6j1ic1m45zyic7nm5ark7frq8j78rrx4zn"; }; diff --git a/pkgs/tools/misc/txtw/default.nix b/pkgs/tools/misc/txtw/default.nix index 90a9e0fa66f..b642fb6ec5c 100644 --- a/pkgs/tools/misc/txtw/default.nix +++ b/pkgs/tools/misc/txtw/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "0.4"; - name = "txtw-${version}"; + pname = "txtw"; src = fetchFromGitHub { owner = "baskerville"; diff --git a/pkgs/tools/misc/ultrastar-creator/default.nix b/pkgs/tools/misc/ultrastar-creator/default.nix index 195a31b63e5..d80af088342 100644 --- a/pkgs/tools/misc/ultrastar-creator/default.nix +++ b/pkgs/tools/misc/ultrastar-creator/default.nix @@ -7,7 +7,7 @@ # https://github.com/UltraStar-Deluxe/UltraStar-Creator/commits/BASS_removed stdenv.mkDerivation rec { - name = "ultrastar-creator-${version}"; + pname = "ultrastar-creator"; version = "2019-04-23"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/umlet/default.nix b/pkgs/tools/misc/umlet/default.nix index 9ac60ca8b13..2b70848cbb8 100644 --- a/pkgs/tools/misc/umlet/default.nix +++ b/pkgs/tools/misc/umlet/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { major = "14"; minor = "3"; version = "${major}.${minor}.0"; - name = "umlet-${version}"; + pname = "umlet"; src = fetchurl { url = "http://www.umlet.com/umlet_${major}_${minor}/umlet-standalone-${version}.zip"; diff --git a/pkgs/tools/misc/units/default.nix b/pkgs/tools/misc/units/default.nix index 374e1b9eaf6..8f66f566aa7 100644 --- a/pkgs/tools/misc/units/default.nix +++ b/pkgs/tools/misc/units/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, readline }: stdenv.mkDerivation rec { - name = "units-${version}"; + pname = "units"; version = "2.19"; src = fetchurl { - url = "mirror://gnu/units/${name}.tar.gz"; + url = "mirror://gnu/units/${pname}-${version}.tar.gz"; sha256 = "0mk562g7dnidjgfgvkxxpvlba66fh1ykmfd9ylzvcln1vxmi6qj2"; }; diff --git a/pkgs/tools/misc/up/default.nix b/pkgs/tools/misc/up/default.nix index 01b62eed56c..b3937175604 100644 --- a/pkgs/tools/misc/up/default.nix +++ b/pkgs/tools/misc/up/default.nix @@ -1,7 +1,7 @@ { lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { - name = "up-${version}"; + pname = "up"; version = "0.3.2"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/upower-notify/default.nix b/pkgs/tools/misc/upower-notify/default.nix index 7751e03df19..607cb47ed4e 100644 --- a/pkgs/tools/misc/upower-notify/default.nix +++ b/pkgs/tools/misc/upower-notify/default.nix @@ -7,7 +7,7 @@ # (sleep 3; exec ${pkgs.yeshup}/bin/yeshup ${pkgs.go-upower-notify}/bin/upower-notify) & # ''; buildGoPackage rec { - name = "upower-notify-${version}"; + pname = "upower-notify"; version = "20160310-${stdenv.lib.strings.substring 0 7 rev}"; rev = "14c581e683a7e90ec9fa6d409413c16599a5323c"; diff --git a/pkgs/tools/misc/urjtag/default.nix b/pkgs/tools/misc/urjtag/default.nix index 545d7c554ac..fe89e74cb69 100644 --- a/pkgs/tools/misc/urjtag/default.nix +++ b/pkgs/tools/misc/urjtag/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { version = "0.10"; - name = "urjtag-${version}"; + pname = "urjtag"; src = fetchsvn { url = "svn://svn.code.sf.net/p/urjtag/svn/trunk/urjtag"; diff --git a/pkgs/tools/misc/vfdecrypt/default.nix b/pkgs/tools/misc/vfdecrypt/default.nix index 83b91f6203e..48bd2b140b7 100644 --- a/pkgs/tools/misc/vfdecrypt/default.nix +++ b/pkgs/tools/misc/vfdecrypt/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, openssl }: stdenv.mkDerivation rec { - name = "vfdecrypt-${version}"; + pname = "vfdecrypt"; version = "unstable-2010-08-13"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/vimer/default.nix b/pkgs/tools/misc/vimer/default.nix index a655aa9502e..7f81774aebe 100644 --- a/pkgs/tools/misc/vimer/default.nix +++ b/pkgs/tools/misc/vimer/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "0.2.0"; - name = "vimer-${version}"; + pname = "vimer"; src = fetchFromGitHub { owner = "susam"; diff --git a/pkgs/tools/misc/vimpager/build.nix b/pkgs/tools/misc/vimpager/build.nix index e9733c7ef79..858cbe9e317 100644 --- a/pkgs/tools/misc/vimpager/build.nix +++ b/pkgs/tools/misc/vimpager/build.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { inherit version; - name = "vimpager-${version}"; + pname = "vimpager"; src = fetchFromGitHub { inherit sha256; diff --git a/pkgs/tools/misc/wakatime/default.nix b/pkgs/tools/misc/wakatime/default.nix index 4f1ca8f89ce..06280b49fbf 100644 --- a/pkgs/tools/misc/wakatime/default.nix +++ b/pkgs/tools/misc/wakatime/default.nix @@ -2,7 +2,7 @@ with python3Packages; buildPythonApplication rec { - name = "wakatime-${version}"; + pname = "wakatime"; version = "10.8.0"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/wl-clipboard/default.nix b/pkgs/tools/misc/wl-clipboard/default.nix index 00e26d762a4..de3a19c3f51 100644 --- a/pkgs/tools/misc/wl-clipboard/default.nix +++ b/pkgs/tools/misc/wl-clipboard/default.nix @@ -2,7 +2,7 @@ , wayland, wayland-protocols }: stdenv.mkDerivation rec { - name = "wl-clipboard-${version}"; + pname = "wl-clipboard"; version = "1.0.0"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/woeusb/default.nix b/pkgs/tools/misc/woeusb/default.nix index 12a97a2e8e4..f25034dd8cd 100644 --- a/pkgs/tools/misc/woeusb/default.nix +++ b/pkgs/tools/misc/woeusb/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { version = "3.3.0"; - name = "woeusb-${version}"; + pname = "woeusb"; src = fetchFromGitHub { owner = "slacka"; diff --git a/pkgs/tools/misc/woof/default.nix b/pkgs/tools/misc/woof/default.nix index 35da2e0a4e9..fa3ab747f64 100644 --- a/pkgs/tools/misc/woof/default.nix +++ b/pkgs/tools/misc/woof/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "2012-05-31"; - name = "woof-${version}"; + pname = "woof"; src = fetchurl { url = "http://www.home.unix-ag.org/simon/woof-${version}.py"; diff --git a/pkgs/tools/misc/wv/default.nix b/pkgs/tools/misc/wv/default.nix index f19d448e5fc..78affe34b58 100644 --- a/pkgs/tools/misc/wv/default.nix +++ b/pkgs/tools/misc/wv/default.nix @@ -4,10 +4,9 @@ stdenv.mkDerivation rec { pname = "wv"; version = "1.2.9"; - name = "${pname}-${version}"; src = fetchurl { - url = "http://www.abisource.com/downloads/${pname}/${version}/${name}.tar.gz"; + url = "http://www.abisource.com/downloads/${pname}/${version}/${pname}-${version}.tar.gz"; sha256 = "17f16lkdv1c3amaz2hagiicih59ynpp4786k1m2qa1sw68xhswsc"; }; diff --git a/pkgs/tools/misc/wyrd/default.nix b/pkgs/tools/misc/wyrd/default.nix index 1029dbb29d8..ec516555273 100644 --- a/pkgs/tools/misc/wyrd/default.nix +++ b/pkgs/tools/misc/wyrd/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.4.6"; - name = "wyrd-${version}"; + pname = "wyrd"; src = fetchurl { url = "http://pessimization.com/software/wyrd/wyrd-${version}.tar.gz"; diff --git a/pkgs/tools/misc/xclip/default.nix b/pkgs/tools/misc/xclip/default.nix index 79565af8e92..69009b86af8 100644 --- a/pkgs/tools/misc/xclip/default.nix +++ b/pkgs/tools/misc/xclip/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, libXmu }: stdenv.mkDerivation rec { - name = "xclip-${version}"; + pname = "xclip"; version = "0.13"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/xdaliclock/default.nix b/pkgs/tools/misc/xdaliclock/default.nix index 8260d7921ec..28268052826 100644 --- a/pkgs/tools/misc/xdaliclock/default.nix +++ b/pkgs/tools/misc/xdaliclock/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libX11, xorgproto, libXt, libICE, libSM, libXext }: stdenv.mkDerivation rec { - name = "xdaliclock-${version}"; + pname = "xdaliclock"; version = "2.44"; src = fetchurl { - url="https://www.jwz.org/xdaliclock/${name}.tar.gz"; + url="https://www.jwz.org/xdaliclock/${pname}-${version}.tar.gz"; sha256 = "1gsgnsm6ql0mcg9zpdkhws3g23r3a92bc3rpg4qbgbmd02nvj3c0"; }; diff --git a/pkgs/tools/misc/xdo/default.nix b/pkgs/tools/misc/xdo/default.nix index c33e01fa0e7..f042b9e209f 100644 --- a/pkgs/tools/misc/xdo/default.nix +++ b/pkgs/tools/misc/xdo/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, libxcb, xcbutil, xcbutilwm }: stdenv.mkDerivation rec { - name = "xdo-${version}"; + pname = "xdo"; version = "0.5.7"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/xflux/gui.nix b/pkgs/tools/misc/xflux/gui.nix index d8959687945..f3f80143c57 100644 --- a/pkgs/tools/misc/xflux/gui.nix +++ b/pkgs/tools/misc/xflux/gui.nix @@ -3,7 +3,7 @@ , libappindicator-gtk2, xflux, librsvg, wrapGAppsHook }: pythonPackages.buildPythonApplication rec { - name = "xflux-gui-${version}"; + pname = "xflux-gui"; version = "1.1.10"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/xiccd/default.nix b/pkgs/tools/misc/xiccd/default.nix index f51746e312e..43a67406970 100644 --- a/pkgs/tools/misc/xiccd/default.nix +++ b/pkgs/tools/misc/xiccd/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libX11, libXrandr, glib, colord }: stdenv.mkDerivation rec { - name = "xiccd-${version}"; + pname = "xiccd"; version = "0.3.0"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/xmonad-log/default.nix b/pkgs/tools/misc/xmonad-log/default.nix index 7a092e59562..ad5086f2f59 100644 --- a/pkgs/tools/misc/xmonad-log/default.nix +++ b/pkgs/tools/misc/xmonad-log/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "xmonad-log-${version}"; + pname = "xmonad-log"; version = "0.1.0"; goPackagePath = "github.com/xintron/xmonad-log"; diff --git a/pkgs/tools/misc/xsel/default.nix b/pkgs/tools/misc/xsel/default.nix index 0ec7d58598f..cd4d709fb76 100644 --- a/pkgs/tools/misc/xsel/default.nix +++ b/pkgs/tools/misc/xsel/default.nix @@ -1,7 +1,7 @@ {stdenv, lib, fetchFromGitHub, libX11, autoreconfHook }: stdenv.mkDerivation rec { - name = "xsel-unstable-${version}"; + pname = "xsel-unstable"; version = "2018-01-10"; diff --git a/pkgs/tools/misc/yle-dl/default.nix b/pkgs/tools/misc/yle-dl/default.nix index 303722aac0b..d369bb4fed7 100644 --- a/pkgs/tools/misc/yle-dl/default.nix +++ b/pkgs/tools/misc/yle-dl/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, rtmpdump, php, pythonPackages, ffmpeg }: pythonPackages.buildPythonApplication rec { - name = "yle-dl-${version}"; + pname = "yle-dl"; version = "2.31"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/yubikey-personalization/default.nix b/pkgs/tools/misc/yubikey-personalization/default.nix index 8308d5eebcd..c20fe68b7b2 100644 --- a/pkgs/tools/misc/yubikey-personalization/default.nix +++ b/pkgs/tools/misc/yubikey-personalization/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, libusb, libyubikey, json_c }: stdenv.mkDerivation rec { - name = "yubikey-personalization-${version}"; + pname = "yubikey-personalization"; version = "1.20.0"; src = fetchurl { diff --git a/pkgs/tools/misc/zabbix-cli/default.nix b/pkgs/tools/misc/zabbix-cli/default.nix index a8b621e32ac..d2157388512 100644 --- a/pkgs/tools/misc/zabbix-cli/default.nix +++ b/pkgs/tools/misc/zabbix-cli/default.nix @@ -3,7 +3,7 @@ let pythonPackages = python2Packages; in pythonPackages.buildPythonApplication rec { - name = "zabbix-cli-${version}"; + pname = "zabbix-cli"; version = "2.1.1"; propagatedBuildInputs = with pythonPackages; [ ipaddr requests ]; diff --git a/pkgs/tools/misc/zsh-autoenv/default.nix b/pkgs/tools/misc/zsh-autoenv/default.nix index 61945266e13..657d93a3ca0 100644 --- a/pkgs/tools/misc/zsh-autoenv/default.nix +++ b/pkgs/tools/misc/zsh-autoenv/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, runtimeShell }: stdenv.mkDerivation rec { - name = "zsh-autoenv-${version}"; + pname = "zsh-autoenv"; version = "2017-12-16"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/zsh-navigation-tools/default.nix b/pkgs/tools/misc/zsh-navigation-tools/default.nix index 108071edb64..be64ff47e6b 100644 --- a/pkgs/tools/misc/zsh-navigation-tools/default.nix +++ b/pkgs/tools/misc/zsh-navigation-tools/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "zsh-navigation-tools-${version}"; + pname = "zsh-navigation-tools"; version = "2.2.7"; src = fetchFromGitHub { |