treewide: name -> pname (easy cases) (#66585)

treewide replacement of stdenv.mkDerivation rec { name = "*-${version}"; version = "*"; to pname
2 years ago · 46420bbaa3
4616 changed files with 5674 additions and 6081 deletions
--- a/nixos/modules/hardware/raid/hpsa.nix
+++ b/nixos/modules/hardware/raid/hpsa.nix
@ -4,11 +4,11 @@ with lib;

 let
  hpssacli = pkgs.stdenv.mkDerivation rec {
-    name = "hpssacli-${version}";
+    pname = "hpssacli";
    version = "2.40-13.0";

    src = pkgs.fetchurl {
-      url = "https://downloads.linux.hpe.com/SDR/downloads/MCP/Ubuntu/pool/non-free/${name}_amd64.deb";
+      url = "https://downloads.linux.hpe.com/SDR/downloads/MCP/Ubuntu/pool/non-free/${pname}-${version}_amd64.deb";
      sha256 = "11w7fwk93lmfw0yya4jpjwdmgjimqxx6412sqa166g1pz4jil4sw";
    };

--- a/nixos/tests/common/letsencrypt/default.nix
+++ b/nixos/tests/common/letsencrypt/default.nix
@ -56,11 +56,11 @@

 let
  softhsm = pkgs.stdenv.mkDerivation rec {
-    name = "softhsm-${version}";
+    pname = "softhsm";
    version = "1.3.8";

    src = pkgs.fetchurl {
-      url = "https://dist.opendnssec.org/source/${name}.tar.gz";
+      url = "https://dist.opendnssec.org/source/${pname}-${version}.tar.gz";
      sha256 = "0flmnpkgp65ym7w3qyg78d3fbmvq3aznmi66rgd420n33shf7aif";
    };

--- a/pkgs/applications/altcoins/clightning.nix
+++ b/pkgs/applications/altcoins/clightning.nix
@ -3,7 +3,7 @@

 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "clightning-${version}";
+  pname = "clightning";
  version = "0.7.1";

  src = fetchurl {
--- a/pkgs/applications/altcoins/dashpay.nix
+++ b/pkgs/applications/altcoins/dashpay.nix
@ -8,7 +8,7 @@

 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "dashpay-${version}";
+  pname = "dashpay";
  version = "0.12.2.3";

  src = fetchFromGitHub {
--- a/pkgs/applications/altcoins/dcrd.nix
+++ b/pkgs/applications/altcoins/dcrd.nix
@ -1,7 +1,7 @@
 { stdenv, lib, go, buildGoPackage, dep, fetchgit, git, cacert }:

 buildGoPackage rec {
-  name = "dcrd-${version}";
+  pname = "dcrd";
  version = "1.1.2";
  rev = "refs/tags/v${version}";
  goPackagePath = "github.com/decred/dcrd";
--- a/pkgs/applications/altcoins/dcrwallet.nix
+++ b/pkgs/applications/altcoins/dcrwallet.nix
@ -1,7 +1,7 @@
 { stdenv, lib, go, buildGoPackage, dep, fetchgit, git, cacert }:

 buildGoPackage rec {
-  name = "dcrwallet-${version}";
+  pname = "dcrwallet";
  version = "1.1.2";
  rev = "refs/tags/v${version}";
  goPackagePath = "github.com/decred/dcrwallet";
--- a/pkgs/applications/altcoins/dero.nix
+++ b/pkgs/applications/altcoins/dero.nix
@ -2,7 +2,7 @@
 , lmdb, miniupnpc, readline }:

 stdenv.mkDerivation rec {
-  name = "dero-${version}";
+  pname = "dero";
  version = "0.11.6";

  src = fetchFromGitHub {
--- a/pkgs/applications/altcoins/freicoin.nix
+++ b/pkgs/applications/altcoins/freicoin.nix
@ -2,7 +2,7 @@

 stdenv.mkDerivation rec {
  version = "0.8.6-2";
-  name = "freicoin-${version}";
+  pname = "freicoin";

  src = fetchFromGitHub {
    owner = "freicoin";
--- a/pkgs/applications/altcoins/go-ethereum-classic/default.nix
+++ b/pkgs/applications/altcoins/go-ethereum-classic/default.nix
@ -1,7 +1,7 @@
 { lib, buildGoPackage, fetchgit }:

 buildGoPackage rec {
-  name = "go-ethereum-classic-${version}";
+  pname = "go-ethereum-classic";
  version = "4.0.0";

  goPackagePath = "github.com/ethereumproject/go-ethereum";
--- a/pkgs/applications/altcoins/masari.nix
+++ b/pkgs/applications/altcoins/masari.nix
@ -2,7 +2,7 @@
 , lmdb, miniupnpc, readline }:

 stdenv.mkDerivation rec {
-  name = "masari-${version}";
+  pname = "masari";
  version = "0.1.4.0";

  src = fetchFromGitHub {
--- a/pkgs/applications/altcoins/monero-gui/default.nix
+++ b/pkgs/applications/altcoins/monero-gui/default.nix
@ -24,7 +24,7 @@ let
 in

 stdenv.mkDerivation rec {
-  name = "monero-gui-${version}";
+  pname = "monero-gui";
  version = "0.14.1.2";

  src = fetchFromGitHub {
--- a/pkgs/applications/altcoins/monero/default.nix
+++ b/pkgs/applications/altcoins/monero/default.nix
@ -11,7 +11,7 @@ assert stdenv.isDarwin -> IOKit != null;
 with stdenv.lib;

 stdenv.mkDerivation rec {
-  name    = "monero-${version}";
+  pname = "monero";
  version = "0.14.1.0";

  src = fetchgit {
--- a/pkgs/applications/altcoins/nano-wallet/default.nix
+++ b/pkgs/applications/altcoins/nano-wallet/default.nix
@ -2,7 +2,7 @@

 stdenv.mkDerivation rec {

-  name = "nano-wallet-${version}";
+  pname = "nano-wallet";
  version = "18.0";

  src = fetchFromGitHub {
--- a/pkgs/applications/altcoins/parity-ui/default.nix
+++ b/pkgs/applications/altcoins/parity-ui/default.nix
@ -5,13 +5,13 @@ let
 uiEnv = pkgs.callPackage ./env.nix { };

 in stdenv.mkDerivation rec {
-  name = "parity-ui-${version}";
+  pname = "parity-ui";
  version = "0.3.4";

  src = fetchurl {
    url = "https://github.com/parity-js/shell/releases/download/v${version}/parity-ui_${version}_amd64.deb";
    sha256 = "1xbd00r9ph8w2d6d2c5xg4b5l74ljzs50rpc6kahfznypmh4kr73";
-    name = "${name}.deb";
+    name = "${pname}-${version}.deb";
  };

  nativeBuildInputs = [ makeWrapper nodePackages.asar ];
--- a/pkgs/applications/altcoins/particl/particl-core.nix
+++ b/pkgs/applications/altcoins/particl/particl-core.nix
@ -16,7 +16,7 @@
 with stdenv.lib;

 stdenv.mkDerivation rec {
-  name = "particl-core-${version}";
+  pname = "particl-core";
  version = "0.17.1.2";

  src = fetchurl {
--- a/pkgs/applications/altcoins/pivx.nix
+++ b/pkgs/applications/altcoins/pivx.nix
@ -9,7 +9,7 @@

 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "pivx-${version}";
+  pname = "pivx";
  version = "3.2.0";

  src = fetchFromGitHub {
--- a/pkgs/applications/altcoins/sumokoin.nix
+++ b/pkgs/applications/altcoins/sumokoin.nix
@ -2,7 +2,7 @@
 , libunwind, lmdb, miniupnpc }:

 stdenv.mkDerivation rec {
-  name = "sumokoin-${version}";
+  pname = "sumokoin";
  version = "0.2.0.0";

  src = fetchFromGitHub {
--- a/pkgs/applications/altcoins/wownero.nix
+++ b/pkgs/applications/altcoins/wownero.nix
@ -6,7 +6,7 @@
 with stdenv.lib;

 stdenv.mkDerivation rec {
-  name = "wownero-${version}";
+  pname = "wownero";

  version = "0.6.1.2";
  src = fetchFromGitHub {
--- a/pkgs/applications/audio/AMB-plugins/default.nix
+++ b/pkgs/applications/audio/AMB-plugins/default.nix
@ -2,10 +2,10 @@
 }:

 stdenv.mkDerivation rec {
-  name = "AMB-plugins-${version}";
+  pname = "AMB-plugins";
  version = "0.8.1";
  src = fetchurl {
-    url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2";
+    url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pname}-${version}.tar.bz2";
    sha256 = "0x4blm4visjqj0ndqr0cg776v3b7lvplpc8cgi9n51llhavn0jpl";
  };

--- a/pkgs/applications/audio/FIL-plugins/default.nix
+++ b/pkgs/applications/audio/FIL-plugins/default.nix
@ -2,10 +2,10 @@
 }:

 stdenv.mkDerivation rec {
-  name = "FIL-plugins-${version}";
+  pname = "FIL-plugins";
  version = "0.3.0";
  src = fetchurl {
-    url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2";
+    url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pname}-${version}.tar.bz2";
    sha256 = "1scfv9j7jrp50r565haa4rvxn1vk2ss86xssl5qgcr8r45qz42qw";
  };

--- a/pkgs/applications/audio/MMA/default.nix
+++ b/pkgs/applications/audio/MMA/default.nix
@ -2,7 +2,7 @@

  stdenv.mkDerivation rec {
  version = "16.06";
-  name = "mma-${version}";
+  pname = "mma";

  src = fetchurl {
    url = "https://www.mellowood.ca/mma/mma-bin-${version}.tar.gz";
--- a/pkgs/applications/audio/a2jmidid/default.nix
+++ b/pkgs/applications/audio/a2jmidid/default.nix
@ -5,7 +5,7 @@
 let
  inherit (python2Packages) python dbus-python;
 in stdenv.mkDerivation rec {
-  name = "a2jmidid-${version}";
+  pname = "a2jmidid";
  version = "8";

  src = fetchurl {
--- a/pkgs/applications/audio/aeolus/default.nix
+++ b/pkgs/applications/audio/aeolus/default.nix
@ -3,11 +3,11 @@
 }:

 stdenv.mkDerivation rec {
-  name = "aeolus-${version}";
+  pname = "aeolus";
  version = "0.9.7";

  src = fetchurl {
-    url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2";
+    url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pname}-${version}.tar.bz2";
    sha256 = "0lhbr95hmbfj8ynbcpawn7jzjbpvrkm6k2yda39yhqk1bzg38v2k";
  };

--- a/pkgs/applications/audio/ams-lv2/default.nix
+++ b/pkgs/applications/audio/ams-lv2/default.nix
@ -2,7 +2,7 @@
 , wafHook }:

 stdenv.mkDerivation  rec {
-  name = "ams-lv2-${version}";
+  pname = "ams-lv2";
  version = "1.2.2";

  src = fetchFromGitHub {
--- a/pkgs/applications/audio/ario/default.nix
+++ b/pkgs/applications/audio/ario/default.nix
@ -5,10 +5,10 @@

 stdenv.mkDerivation rec {
  version = "1.6";
-  name = "ario-${version}";
+  pname = "ario";

  src = fetchurl {
-    url = "mirror://sourceforge/ario-player/${name}.tar.gz";
+    url = "mirror://sourceforge/ario-player/${pname}-${version}.tar.gz";
    sha256 = "16nhfb3h5pc7flagfdz7xy0iq6kvgy6h4bfpi523i57rxvlfshhl";
  };

--- a/pkgs/applications/audio/artyFX/default.nix
+++ b/pkgs/applications/audio/artyFX/default.nix
@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub , cairomm, cmake, libjack2, libpthreadstubs, libXdmcp, libxshmfence, libsndfile, lv2, ntk, pkgconfig }:

 stdenv.mkDerivation rec {
-  name = "artyFX-${version}";
+  pname = "artyFX";
  version = "1.3";

  src = fetchFromGitHub {
--- a/pkgs/applications/audio/asunder/default.nix
+++ b/pkgs/applications/audio/asunder/default.nix
@ -13,9 +13,9 @@ with stdenv.lib;

 stdenv.mkDerivation rec {
  version = "2.9.3";
-  name = "asunder-${version}";
+  pname = "asunder";
  src = fetchurl {
-    url = "http://littlesvr.ca/asunder/releases/${name}.tar.bz2";
+    url = "http://littlesvr.ca/asunder/releases/${pname}-${version}.tar.bz2";
    sha256 = "1630i1df06y840v3fgdf75jxw1s8kwbfn5bhi0686viah0scccw5";
  };

--- a/pkgs/applications/audio/audacious/default.nix
+++ b/pkgs/applications/audio/audacious/default.nix
@ -7,7 +7,7 @@
 }:

 stdenv.mkDerivation rec {
-  name = "audacious-${version}";
+  pname = "audacious";
  version = "3.9";

  src = fetchurl {
--- a/pkgs/applications/audio/audacity/default.nix
+++ b/pkgs/applications/audio/audacity/default.nix
@ -8,7 +8,7 @@ with stdenv.lib;

 stdenv.mkDerivation rec {
  version = "2.3.2";
-  name = "audacity-${version}";
+  pname = "audacity";

  src = fetchurl {
    url = "https://github.com/audacity/audacity/archive/Audacity-${version}.tar.gz";
--- a/pkgs/applications/audio/audio-recorder/default.nix
+++ b/pkgs/applications/audio/audio-recorder/default.nix
@ -5,11 +5,11 @@
 , pulseaudioSupport ? true, libpulseaudio ? null }:

 stdenv.mkDerivation rec {
-  name = "audio-recorder-${version}";
+  pname = "audio-recorder";
  version = "2.1.3";

  src = fetchurl {
-    name = "${name}.tar.gz";
+    name = "${pname}-${version}.tar.gz";
    url = "${meta.homepage}/+archive/ubuntu/ppa/+files/audio-recorder_${version}%7Ebionic.tar.gz";
    sha256 = "160pnmnmc9zwzyclsci3w1qwlgxkfx1y3x5ck6i587w78570an1r";
  };
--- a/pkgs/applications/audio/avldrums-lv2/default.nix
+++ b/pkgs/applications/audio/avldrums-lv2/default.nix
@ -1,7 +1,6 @@
 { stdenv, fetchFromGitHub, pkgconfig, pango, cairo, libGLU, lv2 }:

 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
  pname = "avldrums.lv2";
  version = "0.3.5";

--- a/pkgs/applications/audio/axoloti/default.nix
+++ b/pkgs/applications/audio/axoloti/default.nix
@ -4,7 +4,7 @@

 stdenv.mkDerivation rec {
  version = "1.0.12-2";
-  name = "axoloti-${version}";
+  pname = "axoloti";

  src = fetchFromGitHub {
    owner = "axoloti";
--- a/pkgs/applications/audio/axoloti/dfu-util.nix
+++ b/pkgs/applications/audio/axoloti/dfu-util.nix
@ -1,14 +1,14 @@
 { stdenv, fetchurl, pkgconfig, libusb1-axoloti }:

 stdenv.mkDerivation rec {
-  name="dfu-util-${version}";
+  pname = "dfu-util";
  version = "0.8";

  nativeBuildInputs = [ pkgconfig ];
  buildInputs = [ libusb1-axoloti ];

  src = fetchurl {
-    url = "http://dfu-util.sourceforge.net/releases/${name}.tar.gz";
+    url = "http://dfu-util.sourceforge.net/releases/${pname}-${version}.tar.gz";
    sha256 = "0n7h08avlzin04j93m6hkq9id6hxjiiix7ff9gc2n89aw6dxxjsm";
  };

--- a/pkgs/applications/audio/baudline/default.nix
+++ b/pkgs/applications/audio/baudline/default.nix
@ -7,7 +7,7 @@ let
    [ libXmu libXt libX11 libXext libXxf86vm libjack2 ];
 in
 stdenv.mkDerivation rec {
-  name = "baudline-${version}";
+  pname = "baudline";
  version = "1.08";

  src =
--- a/pkgs/applications/audio/bitmeter/default.nix
+++ b/pkgs/applications/audio/bitmeter/default.nix
@ -1,11 +1,11 @@
 { stdenv, autoreconfHook, fetchurl, libjack2, gtk2, pkgconfig }:

 stdenv.mkDerivation rec {
-  name = "bitmeter-${version}";
+  pname = "bitmeter";
  version = "1.2";

  src = fetchurl {
-    url = "https://devel.tlrmx.org/audio/source/${name}.tar.gz";
+    url = "https://devel.tlrmx.org/audio/source/${pname}-${version}.tar.gz";
    sha256 = "09ck2gxqky701dc1p0ip61rrn16v0pdc7ih2hc2sd63zcw53g2a7";
  };

--- a/pkgs/applications/audio/bitwig-studio/bitwig-studio1.nix
+++ b/pkgs/applications/audio/bitwig-studio/bitwig-studio1.nix
@ -6,7 +6,7 @@
 , xdg_utils, zenity, zlib }:

 stdenv.mkDerivation rec {
-  name = "bitwig-studio-${version}";
+  pname = "bitwig-studio";
  version = "1.3.16";

  src = fetchurl {
--- a/pkgs/applications/audio/bristol/default.nix
+++ b/pkgs/applications/audio/bristol/default.nix
@ -1,11 +1,11 @@
 { stdenv, fetchurl, alsaLib, libjack2, pkgconfig, libpulseaudio, xorg }:

 stdenv.mkDerivation  rec {
-  name = "bristol-${version}";
+  pname = "bristol";
  version = "0.60.11";

  src = fetchurl {
-    url = "mirror://sourceforge/bristol/${name}.tar.gz";
+    url = "mirror://sourceforge/bristol/${pname}-${version}.tar.gz";
    sha256 = "1fi2m4gmvxdi260821y09lxsimq82yv4k5bbgk3kyc3x1nyhn7vx";
  };

--- a/pkgs/applications/audio/bs1770gain/default.nix
+++ b/pkgs/applications/audio/bs1770gain/default.nix
@ -1,11 +1,11 @@
 { stdenv, fetchurl, ffmpeg, sox }:

 stdenv.mkDerivation rec {
-  name = "bs1770gain-${version}";
+  pname = "bs1770gain";
  version = "0.5.2";

  src = fetchurl {
-    url = "mirror://sourceforge/bs1770gain/${name}.tar.gz";
+    url = "mirror://sourceforge/bs1770gain/${pname}-${version}.tar.gz";
    sha256 = "1p6yz5q7czyf9ard65sp4kawdlkg40cfscr3b24znymmhs3p7rbk";
  };

--- a/pkgs/applications/audio/calf/default.nix
+++ b/pkgs/applications/audio/calf/default.nix
@ -2,11 +2,11 @@
 , gtk2, libjack2, ladspaH , libglade, lv2, pkgconfig }:

 stdenv.mkDerivation rec {
-  name = "calf-${version}";
+  pname = "calf";
  version = "0.90.3";

  src = fetchurl {
-    url = "https://calf-studio-gear.org/files/${name}.tar.gz";
+    url = "https://calf-studio-gear.org/files/${pname}-${version}.tar.gz";
    sha256 = "17x4hylgq4dn9qycsdacfxy64f5cv57n2qgkvsdp524gnqzw4az3";
  };

--- a/pkgs/applications/audio/caps/default.nix
+++ b/pkgs/applications/audio/caps/default.nix
@ -1,6 +1,6 @@
 { stdenv, fetchurl }:
 stdenv.mkDerivation rec {
-  name = "caps-${version}";
+  pname = "caps";
  version = "0.9.26";
  src = fetchurl {
    url = "http://www.quitte.de/dsp/caps_${version}.tar.bz2";
--- a/pkgs/applications/audio/cava/default.nix
+++ b/pkgs/applications/audio/cava/default.nix
@ -2,7 +2,7 @@
  libpulseaudio, ncurses }:

 stdenv.mkDerivation rec {
-  name = "cava-${version}";
+  pname = "cava";
  version = "0.6.1";

  buildInputs = [
--- a/pkgs/applications/audio/cd-discid/default.nix
+++ b/pkgs/applications/audio/cd-discid/default.nix
@ -2,11 +2,11 @@
 , IOKit ? null }:

 stdenv.mkDerivation rec {
-  name = "cd-discid-${version}";
+  pname = "cd-discid";
  version = "1.4";

  src = fetchurl {
-    url = "http://linukz.org/download/${name}.tar.gz";
+    url = "http://linukz.org/download/${pname}-${version}.tar.gz";
    sha256 = "0qrcvn7227qaayjcd5rm7z0k5q89qfy5qkdgwr5pd7ih0va8rmpz";
  };

--- a/pkgs/applications/audio/chuck/default.nix
+++ b/pkgs/applications/audio/chuck/default.nix
@ -4,7 +4,7 @@

 stdenv.mkDerivation rec {
  version = "1.4.0.0";
-  name = "chuck-${version}";
+  pname = "chuck";

  src = fetchurl {
    url = "http://chuck.cs.princeton.edu/release/files/chuck-${version}.tgz";
--- a/pkgs/applications/audio/cmus/default.nix
+++ b/pkgs/applications/audio/cmus/default.nix
@ -101,7 +101,7 @@ let
 in

 stdenv.mkDerivation rec {
-  name = "cmus-${version}";
+  pname = "cmus";
  version = "2.8.0";

  src = fetchFromGitHub {
--- a/pkgs/applications/audio/cmusfm/default.nix
+++ b/pkgs/applications/audio/cmusfm/default.nix
@ -2,7 +2,7 @@

 stdenv.mkDerivation rec {
  version = "2018-10-11";
-  name = "cmusfm-unstable-${version}";
+  pname = "cmusfm-unstable";
  src = fetchFromGitHub {
    owner = "Arkq";
    repo = "cmusfm";
--- a/pkgs/applications/audio/csa/default.nix
+++ b/pkgs/applications/audio/csa/default.nix
@ -1,11 +1,11 @@
 { stdenv, fetchurl }:

 stdenv.mkDerivation rec {
-  name = "csa-${version}";
+  pname = "csa";
  version = "0.5.100810";

  src = fetchurl {
-    url = "mirror://sourceforge/csa/${name}.tar.gz";
+    url = "mirror://sourceforge/csa/${pname}-${version}.tar.gz";
    sha256 = "1syg81dzdil0dyx1mlx1n7if3qsf2iz243p2zv34a1acfqm509r3";
  };

--- a/pkgs/applications/audio/csound/csound-qt/default.nix
+++ b/pkgs/applications/audio/csound/csound-qt/default.nix
@ -3,7 +3,7 @@
  qtwebengine, qtxmlpatterns, rtmidi, fetchpatch }:

 stdenv.mkDerivation rec {
-  name = "csound-qt-${version}";
+  pname = "csound-qt";
  version = "0.9.6-beta3";

  src = fetchFromGitHub {
--- a/pkgs/applications/audio/csound/default.nix
+++ b/pkgs/applications/audio/csound/default.nix
@ -13,7 +13,7 @@
 }:

 stdenv.mkDerivation rec {
-  name = "csound-${version}";
+  pname = "csound";
  # When updating, please check if https://github.com/csound/csound/issues/1078
  # has been fixed in the new version so we can use the normal fluidsynth
  # version and remove fluidsynth 1.x from nixpkgs again.
--- a/pkgs/applications/audio/deadbeef/plugins/headerbar-gtk3.nix
+++ b/pkgs/applications/audio/deadbeef/plugins/headerbar-gtk3.nix
@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, libxml2, deadbeef, glib, gtk3 }:

 stdenv.mkDerivation rec {
-  name = "deadbeef-headerbar-gtk3-plugin-${version}";
+  pname = "deadbeef-headerbar-gtk3-plugin";
  version = "1.2";

  src = fetchFromGitHub {
--- a/pkgs/applications/audio/deadbeef/plugins/infobar.nix
+++ b/pkgs/applications/audio/deadbeef/plugins/infobar.nix
@ -1,7 +1,7 @@
 { stdenv, fetchurl, pkgconfig, deadbeef, gtk3, libxml2 }:

 stdenv.mkDerivation rec {
-  name = "deadbeef-infobar-plugin-${version}";
+  pname = "deadbeef-infobar-plugin";
  version = "1.4";

  src = fetchurl {
--- a/pkgs/applications/audio/deadbeef/plugins/mpris2.nix
+++ b/pkgs/applications/audio/deadbeef/plugins/mpris2.nix
@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, deadbeef, glib }:

 stdenv.mkDerivation rec {
-  name = "deadbeef-mpris2-plugin-${version}";
+  pname = "deadbeef-mpris2-plugin";
  version = "1.12";

  src = fetchurl {
-    url = "https://github.com/Serranya/deadbeef-mpris2-plugin/releases/download/v${version}/${name}.tar.xz";
+    url = "https://github.com/Serranya/deadbeef-mpris2-plugin/releases/download/v${version}/${pname}-${version}.tar.xz";
    sha256 = "0s3y4ka4qf38cypc0xspy79q0g5y1kqx6ldad7yr6a45nw6j95jh";
  };

--- a/pkgs/applications/audio/denemo/default.nix
+++ b/pkgs/applications/audio/denemo/default.nix
@ -5,7 +5,7 @@
 , portaudio, portmidi, fftw, makeWrapper }:

 stdenv.mkDerivation rec {
-  name = "denemo-${version}";
+  pname = "denemo";
  version = "2.3.0";

  src = fetchurl {
--- a/pkgs/applications/audio/dfasma/default.nix
+++ b/pkgs/applications/audio/dfasma/default.nix
@ -27,7 +27,7 @@ let
  };

 in stdenv.mkDerivation rec {
-  name = "dfasma-${version}";
+  pname = "dfasma";
  version = "1.4.5";

  src = fetchFromGitHub {
--- a/pkgs/applications/audio/distrho/default.nix
+++ b/pkgs/applications/audio/distrho/default.nix
@ -8,7 +8,7 @@ let
              else if stdenv.hostPlatform.isWindows then "mingw"
              else "linux";
 in stdenv.mkDerivation rec {
-  name = "distrho-ports-${version}";
+  pname = "distrho-ports";
  version = "2018-04-16";

  src = fetchFromGitHub {
--- a/pkgs/applications/audio/drumgizmo/default.nix
+++ b/pkgs/applications/audio/drumgizmo/default.nix
@ -4,10 +4,10 @@

 stdenv.mkDerivation rec {
  version = "0.9.17";
-  name = "drumgizmo-${version}";
+  pname = "drumgizmo";

  src = fetchurl {
-    url = "https://www.drumgizmo.org/releases/${name}/${name}.tar.gz";
+    url = "https://www.drumgizmo.org/releases/${pname}-${version}/${pname}-${version}.tar.gz";
    sha256 = "177c27kz9srds7a659zz9yhp58z0zsk0ydwww7l3jkjlylm1p8x1";
  };

--- a/pkgs/applications/audio/drumkv1/default.nix
+++ b/pkgs/applications/audio/drumkv1/default.nix
@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, libjack2, alsaLib, libsndfile, liblo, lv2, qt5 }:

 stdenv.mkDerivation rec {
-  name = "drumkv1-${version}";
+  pname = "drumkv1";
  version = "0.9.9";

  src = fetchurl {
-    url = "mirror://sourceforge/drumkv1/${name}.tar.gz";
+    url = "mirror://sourceforge/drumkv1/${pname}-${version}.tar.gz";
    sha256 = "02sa29fdjgwcf7izly685gxvga3bxyyqvskvfiisgm2xg3h9r983";
  };

--- a/pkgs/applications/audio/ecasound/default.nix
+++ b/pkgs/applications/audio/ecasound/default.nix
@ -14,7 +14,7 @@
 # TODO: fix readline, ncurses, lilv, liblo, liboil and python. See configure log.

 stdenv.mkDerivation rec {
-  name = "ecasound-${version}";
+  pname = "ecasound";
  version = "2.9.2";

  src = fetchurl {
--- a/pkgs/applications/audio/eflite/default.nix
+++ b/pkgs/applications/audio/eflite/default.nix
@ -1,11 +1,11 @@
 { stdenv, fetchurl, fetchpatch, flite, alsaLib, debug ? false }:

 stdenv.mkDerivation rec {
-  name = "eflite-${version}";
+  pname = "eflite";
  version = "0.4.1";

  src = fetchurl {
-    url = "https://sourceforge.net/projects/eflite/files/eflite/${version}/${name}.tar.gz";
+    url = "https://sourceforge.net/projects/eflite/files/eflite/${version}/${pname}-${version}.tar.gz";
    sha256 = "088p9w816s02s64grfs28gai3lnibzdjb9d1jwxzr8smbs2qbbci";
  };

--- a/pkgs/applications/audio/eq10q/default.nix
+++ b/pkgs/applications/audio/eq10q/default.nix
@ -1,10 +1,10 @@
 { stdenv, fetchurl, fetchpatch, cmake, fftw, gtkmm2, libxcb, lv2, pkgconfig
 , xorg }:
 stdenv.mkDerivation rec {
-  name = "eq10q-${version}";
+  pname = "eq10q";
  version = "2.2";
  src = fetchurl {
-    url = "mirror://sourceforge/project/eq10q/${name}.tar.gz";
+    url = "mirror://sourceforge/project/eq10q/${pname}-${version}.tar.gz";
    sha256 = "16mhcav8gwkp29k9ki4dlkajlcgh1i2wvldabxb046d37dq4qzrk";
  };

--- a/pkgs/applications/audio/espeak-ng/default.nix
+++ b/pkgs/applications/audio/espeak-ng/default.nix
@ -4,7 +4,7 @@
 , sonicSupport ? true, sonic }:

 stdenv.mkDerivation rec {
-  name = "espeak-ng-${version}";
+  pname = "espeak-ng";
  version = "1.49.2";

  src = fetchFromGitHub {
--- a/pkgs/applications/audio/eteroj.lv2/default.nix
+++ b/pkgs/applications/audio/eteroj.lv2/default.nix
@ -3,7 +3,6 @@
 stdenv.mkDerivation rec {
  pname = "eteroj.lv2";
  version = "0.4.0";
-  name = "${pname}-${version}";

  src = fetchFromGitHub {
    owner  = "OpenMusicKontrollers";
--- a/pkgs/applications/audio/faust/faustlive.nix
+++ b/pkgs/applications/audio/faust/faustlive.nix
@ -4,7 +4,7 @@
 }:

 stdenv.mkDerivation rec {
-  name = "faustlive-${version}";
+  pname = "faustlive";
  version = "2017-12-05";
  src = fetchFromGitHub {
    owner = "grame-cncm";
--- a/pkgs/applications/audio/flac123/default.nix
+++ b/pkgs/applications/audio/flac123/default.nix
@ -1,11 +1,11 @@
 { stdenv, fetchurl, autoreconfHook, flac, libao, libogg, popt }:

 stdenv.mkDerivation rec {
-  name = "flac123-${version}";
+  pname = "flac123";
  version = "0.0.12";

  src = fetchurl {
-    url = "mirror://sourceforge/flac-tools/${name}-release.tar.gz";
+    url = "mirror://sourceforge/flac-tools/${pname}-${version}-release.tar.gz";
    sha256 = "0zg4ahkg7v81za518x32wldf42g0rrvlrcqhrg9sv3li9bayyxhr";
  };

--- a/pkgs/applications/audio/flacon/default.nix
+++ b/pkgs/applications/audio/flacon/default.nix
@ -4,7 +4,7 @@
 }:

 stdenv.mkDerivation rec {
-  name = "flacon-${version}";
+  pname = "flacon";
  version = "5.4.0";

  src = fetchFromGitHub {
--- a/pkgs/applications/audio/fmit/default.nix
+++ b/pkgs/applications/audio/fmit/default.nix
@ -10,7 +10,7 @@ assert portaudioSupport -> portaudio != null;
 with stdenv.lib;

 stdenv.mkDerivation rec {
-  name = "fmit-${version}";
+  pname = "fmit";
  version = "1.1.14";

  src = fetchFromGitHub {
--- a/pkgs/applications/audio/fmsynth/default.nix
+++ b/pkgs/applications/audio/fmsynth/default.nix
@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, gtkmm2, lv2, lvtk, pkgconfig }:
 stdenv.mkDerivation rec {
-  name = "fmsynth-unstable-${version}";
+  pname = "fmsynth-unstable";
  version = "2015-02-07";
  src = fetchFromGitHub {
    owner = "Themaister";
--- a/pkgs/applications/audio/fomp/default.nix
+++ b/pkgs/applications/audio/fomp/default.nix
@ -1,11 +1,11 @@
 { stdenv, fetchurl, lv2, pkgconfig, python2, wafHook }:

 stdenv.mkDerivation rec {
-  name = "fomp-${version}";
+  pname = "fomp";
  version = "1.0.0";

  src = fetchurl {
-    url = "https://download.drobilla.net/${name}.tar.bz2";
+    url = "https://download.drobilla.net/${pname}-${version}.tar.bz2";
    sha256 = "1hh2xhknanqn3iwp12ihl6bf8p7bqxryms9qk7mh21lixl42b8k5";
  };

--- a/pkgs/applications/audio/foo-yc20/default.nix
+++ b/pkgs/applications/audio/foo-yc20/default.nix
@ -2,7 +2,7 @@

 stdenv.mkDerivation rec {
  version = "git-2015-05-21";
-  name = "foo-yc20-${version}";
+  pname = "foo-yc20";
  src = fetchFromGitHub {
    owner = "sampov2";
    repo = "foo-yc20";
--- a/pkgs/applications/audio/freewheeling/default.nix
+++ b/pkgs/applications/audio/freewheeling/default.nix
@ -7,7 +7,7 @@ let
 in

 stdenv.mkDerivation rec {
-  name = "freewheeling-${version}";
+  pname = "freewheeling";
  version = "0.6.5";

  src = fetchFromGitHub {
--- a/pkgs/applications/audio/game-music-emu/default.nix
+++ b/pkgs/applications/audio/game-music-emu/default.nix
@ -2,10 +2,10 @@

 stdenv.mkDerivation rec {
  version = "0.6.1";
-  name = "game-music-emu-${version}";
+  pname = "game-music-emu";

  src = fetchurl {
-    url = "https://bitbucket.org/mpyne/game-music-emu/downloads/${name}.tar.bz2";
+    url = "https://bitbucket.org/mpyne/game-music-emu/downloads/${pname}-${version}.tar.bz2";
    sha256 = "08fk7zddpn7v93d0fa7fcypx7hvgwx9b5psj9l6m8b87k2hbw4fw";
  };

--- a/pkgs/applications/audio/gigedit/default.nix
+++ b/pkgs/applications/audio/gigedit/default.nix
@ -3,11 +3,11 @@
 }:

 stdenv.mkDerivation rec {
-  name = "gigedit-${version}";
+  pname = "gigedit";
  version = "1.1.0";

  src = fetchurl {
-    url = "https://download.linuxsampler.org/packages/${name}.tar.bz2";
+    url = "https://download.linuxsampler.org/packages/${pname}-${version}.tar.bz2";
    sha256 = "087pc919q28r1vw31c7w4m14bqnp4md1i2wbmk8w0vmwv2cbx2ni";
  };

--- a/pkgs/applications/audio/gmpc/default.nix
+++ b/pkgs/applications/audio/gmpc/default.nix
@ -4,7 +4,7 @@
 }:

 stdenv.mkDerivation rec {
-  name = "gmpc-${version}";
+  pname = "gmpc";
  version = "11.8.16";

  libmpd = stdenv.mkDerivation {
--- a/pkgs/applications/audio/gnome-podcasts/default.nix
+++ b/pkgs/applications/audio/gnome-podcasts/default.nix
@ -5,7 +5,7 @@
 # rustPlatform.buildRustPackage rec {
 stdenv.mkDerivation rec {
  version = "0.4.6";
-  name = "gnome-podcasts-${version}";
+  pname = "gnome-podcasts";

  src = fetchurl {
    url = https://gitlab.gnome.org/World/podcasts/uploads/e59ac5d618d7daf4c7f33ba72957c466/gnome-podcasts-0.4.6.tar.xz;
--- a/pkgs/applications/audio/greg/default.nix
+++ b/pkgs/applications/audio/greg/default.nix
@ -3,7 +3,6 @@
 with pythonPackages; buildPythonApplication rec {
  pname = "greg";
  version = "0.4.7";
-  name = pname + "-" + version;

  disabled = !isPy3k;

--- a/pkgs/applications/audio/gtkpod/default.nix
+++ b/pkgs/applications/audio/gtkpod/default.nix
@ -4,10 +4,10 @@

 stdenv.mkDerivation rec {
  version = "2.1.5";
-  name = "gtkpod-${version}";
+  pname = "gtkpod";

  src = fetchurl {
-    url = "mirror://sourceforge/gtkpod/${name}.tar.gz";
+    url = "mirror://sourceforge/gtkpod/${pname}-${version}.tar.gz";
    sha256 = "0xisrpx069f7bjkyc8vqxb4k0480jmx1wscqxr6cpq1qj6pchzd5";
  };

--- a/pkgs/applications/audio/guitarix/default.nix
+++ b/pkgs/applications/audio/guitarix/default.nix
@ -11,7 +11,7 @@ let
 in

 stdenv.mkDerivation rec {
-  name = "guitarix-${version}";
+  pname = "guitarix";
  version = "0.38.1";

  src = fetchurl {
--- a/pkgs/applications/audio/gxplugins-lv2/default.nix
+++ b/pkgs/applications/audio/gxplugins-lv2/default.nix
@ -1,7 +1,6 @@
 { stdenv, fetchFromGitHub, xorg, xorgproto, cairo, lv2, pkgconfig }:

 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
  pname = "GxPlugins.lv2";
  version = "0.7";

--- a/pkgs/applications/audio/helm/default.nix
+++ b/pkgs/applications/audio/helm/default.nix
@ -3,7 +3,7 @@

  stdenv.mkDerivation rec {
  version = "0.9.0";
-  name = "helm-${version}";
+  pname = "helm";

  src = fetchFromGitHub {
    owner = "mtytel";
--- a/pkgs/applications/audio/hydrogen/default.nix
+++ b/pkgs/applications/audio/hydrogen/default.nix
@ -3,7 +3,7 @@

 stdenv.mkDerivation rec {
  version = "0.9.7";
-  name = "hydrogen-${version}";
+  pname = "hydrogen";

  src = fetchurl {
    url = "https://github.com/hydrogen-music/hydrogen/archive/${version}.tar.gz";
--- a/pkgs/applications/audio/i-score/default.nix
+++ b/pkgs/applications/audio/i-score/default.nix
@ -27,7 +27,7 @@

 stdenv.mkDerivation rec {
  version = "1.0.0-b31";
-  name = "i-score-${version}";
+  pname = "i-score";

  src = fetchFromGitHub {
    owner = "OSSIA";
--- a/pkgs/applications/audio/iannix/default.nix
+++ b/pkgs/applications/audio/iannix/default.nix
@ -2,7 +2,7 @@
 }:

 stdenv.mkDerivation rec {
-  name = "iannix-${version}";
+  pname = "iannix";
  version = "2016-01-31";
  src = fetchFromGitHub {
    owner = "iannix";
--- a/pkgs/applications/audio/id3v2/default.nix
+++ b/pkgs/applications/audio/id3v2/default.nix
@ -1,11 +1,11 @@
 {stdenv, fetchurl, id3lib, groff, zlib}:
			`@ -1,11 +1,11 @@`
			`{stdenv, fetchurl, id3lib, groff, zlib}:`