[WIP/RFC] make-derivation: default name if pname and version are both set

pkgs/applications/altcoins/aeon/default.nix

@@ -3,11 +3,9 @@
 , zeromq, pcsclite, readline
 }:
 
-let
+stdenv.mkDerivation rec {
+  pname = "aeon";
   version = "0.12.0.0";
-in
-stdenv.mkDerivation {
-  name = "aeon-${version}";
 
   src = fetchFromGitHub {
     owner = "aeonix";

pkgs/applications/altcoins/dapp.nix

@@ -2,7 +2,7 @@
 , seth, git, solc, shellcheck, nodejs, hevm }:
 
 stdenv.mkDerivation rec {
-  name = "dapp-${version}";
+  pname = "dapp";
   version = "0.5.7";
 
   src = fetchFromGitHub {

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 {

pkgs/applications/altcoins/dero.nix

@@ -2,7 +2,7 @@
 , libunwind, lmdb, miniupnpc, readline }:
 
 stdenv.mkDerivation rec {
-  name = "dero-${version}";
+  pname = "dero";
   version = "0.11.6";
 
   src = fetchFromGitHub {

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";

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 {

pkgs/applications/altcoins/monero-gui/default.nix

@@ -11,7 +11,7 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "monero-gui-${version}";
+  pname = "monero-gui";
   version = "0.12.0.0";
 
   src = fetchFromGitHub {

pkgs/applications/altcoins/nano-wallet/default.nix

@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
 
-  name = "nano-wallet-${version}";
+  pname = "nano-wallet";
   version = "12.1";
 
   src = fetchFromGitHub {

pkgs/applications/altcoins/particl/particl-core.nix

@@ -18,7 +18,7 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "particl-core-${version}";
+  pname = "particl-core";
   version     = "0.16.0.5";
 
   src = fetchurl {

pkgs/applications/altcoins/seth.nix

@@ -4,7 +4,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "seth-${version}";
+  pname = "seth";
   version = "0.6.3";
 
   src = fetchFromGitHub {

pkgs/applications/altcoins/stellar-core.nix

@@ -1,13 +1,10 @@
 { stdenv, lib, fetchgit, autoconf, libtool, automake, pkgconfig, git
 , bison, flex, postgresql }:
 
-let
+stdenv.mkDerivation rec {
   pname = "stellar-core";
   version = "0.5.1";
 
-in stdenv.mkDerivation {
-  name = "${pname}-${version}";
-
   src = fetchgit {
     url = "https://github.com/stellar/stellar-core.git";
     rev = "refs/tags/v${version}";

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 {

pkgs/applications/audio/MMA/default.nix

@@ -2,7 +2,7 @@
 
   stdenv.mkDerivation rec {
   version = "16.06";
-  name = "mma-${version}";
+  pname = "mma";
 
   src = fetchurl {
     url = "http://www.mellowood.ca/mma/mma-bin-${version}.tar.gz";

pkgs/applications/audio/a2jmidid/default.nix

@@ -4,7 +4,7 @@
 let
   inherit (python2Packages) python dbus-python;
 in stdenv.mkDerivation rec {
-  name = "a2jmidid-${version}";
+  pname = "a2jmidid";
   version = "8";
 
   src = fetchurl {

pkgs/applications/audio/abcde/default.nix

@@ -3,60 +3,59 @@
 , perl, DigestSHA, MusicBrainz, MusicBrainzDiscID
 , makeWrapper }:
 
-let version = "2.8.1";
-in
-  stdenv.mkDerivation {
-    name = "abcde-${version}";
-    src = fetchurl {
-      url = "http://abcde.einval.com/download/abcde-${version}.tar.gz";
-      sha256 = "0f9bjs0phk23vry7gvh0cll9vl6kmc1y4fwwh762scfdvpbp3774";
-    };
-
-    # FIXME: This package does not support `distmp3', `eject', etc.
-
-    patches = [ ./abcde.patch ];
-
-    configurePhase = ''
-      sed -i "s|^[[:blank:]]*prefix *=.*$|prefix = $out|g ;
-              s|^[[:blank:]]*etcdir *=.*$|etcdir = $out/etc|g ;
-              s|^[[:blank:]]*INSTALL *=.*$|INSTALL = install -c|g" \
-        "Makefile";
-
-      # We use `cd-paranoia' from GNU libcdio, which contains a hyphen
-      # in its name, unlike Xiph's cdparanoia.
-      sed -i "s|^[[:blank:]]*CDPARANOIA=.*$|CDPARANOIA=cd-paranoia|g ;
-              s|^[[:blank:]]*DEFAULT_CDROMREADERS=.*$|DEFAULT_CDROMREADERS=\"cd-paranoia cdda2wav\"|g" \
-        "abcde"
-
-      substituteInPlace "abcde" \
-        --replace "/etc/abcde.conf" "$out/etc/abcde.conf"
-
+stdenv.mkDerivation rec {
+  pname = "abcde";
+  version = "2.8.1";
+  src = fetchurl {
+    url = "http://abcde.einval.com/download/abcde-${version}.tar.gz";
+    sha256 = "0f9bjs0phk23vry7gvh0cll9vl6kmc1y4fwwh762scfdvpbp3774";
+  };
+
+  # FIXME: This package does not support `distmp3', `eject', etc.
+
+  patches = [ ./abcde.patch ];
+
+  configurePhase = ''
+    sed -i "s|^[[:blank:]]*prefix *=.*$|prefix = $out|g ;
+            s|^[[:blank:]]*etcdir *=.*$|etcdir = $out/etc|g ;
+            s|^[[:blank:]]*INSTALL *=.*$|INSTALL = install -c|g" \
+      "Makefile";
+
+    # We use `cd-paranoia' from GNU libcdio, which contains a hyphen
+    # in its name, unlike Xiph's cdparanoia.
+    sed -i "s|^[[:blank:]]*CDPARANOIA=.*$|CDPARANOIA=cd-paranoia|g ;
+            s|^[[:blank:]]*DEFAULT_CDROMREADERS=.*$|DEFAULT_CDROMREADERS=\"cd-paranoia cdda2wav\"|g" \
+      "abcde"
+
+    substituteInPlace "abcde" \
+      --replace "/etc/abcde.conf" "$out/etc/abcde.conf"
+
+  '';
+
+  buildInputs = [ makeWrapper ];
+
+  propagatedBuildInputs = [ perl DigestSHA MusicBrainz MusicBrainzDiscID ];
+
+  installFlags = [ "sysconfdir=$(out)/etc" ];
+
+  postFixup = ''
+    for cmd in abcde cddb-tool abcde-musicbrainz-tool; do
+      wrapProgram "$out/bin/$cmd" --prefix PATH ":" \
+        ${stdenv.lib.makeBinPath [ "$out" which libcdio-paranoia cddiscid wget vorbis-tools id3v2 eyeD3 lame flac glyr ]}
+    done
+  '';
+
+  meta = {
+    homepage = http://abcde.einval.com/wiki/;
+    license = stdenv.lib.licenses.gpl2Plus;
+    description = "Command-line audio CD ripper";
+
+    longDescription = ''
+      abcde is a front-end command-line utility (actually, a shell
+      script) that grabs tracks off a CD, encodes them to
+      Ogg/Vorbis, MP3, FLAC, Ogg/Speex and/or MPP/MP+ (Musepack)
+      format, and tags them, all in one go.
     '';
-
-    buildInputs = [ makeWrapper ];
-
-    propagatedBuildInputs = [ perl DigestSHA MusicBrainz MusicBrainzDiscID ];
-
-    installFlags = [ "sysconfdir=$(out)/etc" ];
-
-    postFixup = ''
-      for cmd in abcde cddb-tool abcde-musicbrainz-tool; do
-        wrapProgram "$out/bin/$cmd" --prefix PATH ":" \
-          ${stdenv.lib.makeBinPath [ "$out" which libcdio-paranoia cddiscid wget vorbis-tools id3v2 eyeD3 lame flac glyr ]}
-      done
-    '';
-
-    meta = {
-      homepage = http://abcde.einval.com/wiki/;
-      license = stdenv.lib.licenses.gpl2Plus;
-      description = "Command-line audio CD ripper";
-
-      longDescription = ''
-        abcde is a front-end command-line utility (actually, a shell
-        script) that grabs tracks off a CD, encodes them to
-        Ogg/Vorbis, MP3, FLAC, Ogg/Speex and/or MPP/MP+ (Musepack)
-        format, and tags them, all in one go.
-      '';
-      platforms = stdenv.lib.platforms.linux;
-    };
-  }
+    platforms = stdenv.lib.platforms.linux;
+  };
+}

pkgs/applications/audio/airwave/default.nix

@@ -37,7 +37,8 @@ let
 in
 
 multiStdenv.mkDerivation {
-  name = "airwave-${version}";
+  pname = "airwave";
+  inherit version;
 
   src = airwave-src;
 

pkgs/applications/audio/ams-lv2/default.nix

@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cairo, fftw, gtkmm2, lv2, lvtk, pkgconfig, python }:
 
 stdenv.mkDerivation  rec {
-  name = "ams-lv2-${version}";
+  pname = "ams-lv2";
   version = "1.2.1";
 
   src = fetchFromGitHub {

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 {

pkgs/applications/audio/audacious/default.nix

@@ -7,7 +7,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "audacious-${version}";
+  pname = "audacious";
   version = "3.9";
 
   src = fetchurl {

pkgs/applications/audio/audacious/qt-5.nix

@@ -31,7 +31,7 @@ in
 
 mkDerivation {
   inherit version;
-  name = "audacious-qt5-${version}";
+  pname = "audacious-qt5";
 
   sourceFiles = lib.attrValues sources;
   sourceRoots = lib.attrNames sources;

pkgs/applications/audio/audacity/default.nix

@@ -8,7 +8,7 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   version = "2.2.2";
-  name = "audacity-${version}";
+  pname = "audacity";
 
   src = fetchurl {
     url = "https://github.com/audacity/audacity/archive/Audacity-${version}.tar.gz";

pkgs/applications/audio/axoloti/default.nix

@@ -3,7 +3,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.0.12-1";
-  name = "axoloti-${version}";
+  pname = "axoloti";
 
   src = fetchFromGitHub {
     owner = "axoloti";

pkgs/applications/audio/banshee/default.nix

@@ -5,7 +5,7 @@
 , libmtp, libgpod, mono-zeroconf }:
 
 stdenv.mkDerivation rec {
-  name = "banshee-${version}";
+  pname = "banshee";
   version = "2.6.2";
 
   src = fetchurl {

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 =

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 {

pkgs/applications/audio/bitwig-studio/bitwig-studio2.nix

@@ -2,7 +2,7 @@
   xdg_utils, zenity, ffmpeg }:
 
 bitwig-studio1.overrideAttrs (oldAttrs: rec {
-  name = "bitwig-studio-${version}";
+  pname = "bitwig-studio";
   version = "2.3.2";
 
   src = fetchurl {

pkgs/applications/audio/cantata/default.nix

@@ -28,19 +28,18 @@ assert withOnlineServices -> withTaglib;
 assert withReplaygain -> withTaglib;
 
 let
-  version = "2.2.0";
-  pname = "cantata";
   fstat = x: fn: "-DENABLE_" + fn + "=" + (if x then "ON" else "OFF");
   fstats = x: map (fstat x);
 
   withUdisks = (withTaglib && withDevices);
 
 in stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
+  version = "2.2.0";
+  pname = "cantata";
 
   src = fetchFromGitHub {
     owner  = "CDrummond";
-    repo   = "cantata";
+    repo   = pname;
     rev    = "v${version}";
     sha256 = "1b633chgfs8rya78bzzck5zijna15d1y4nmrz4dcjp862ks5y5q6";
   };

pkgs/applications/audio/caps/default.nix

@@ -1,6 +1,6 @@
 { stdenv, fetchurl }:
 stdenv.mkDerivation rec {
-  name = "caps-${version}";
+  pname = "caps";
   version = "0.9.24";
   src = fetchurl {
     url = "http://www.quitte.de/dsp/caps_${version}.tar.bz2";

pkgs/applications/audio/caudec/default.nix

@@ -1,11 +1,8 @@
 { stdenv, fetchurl, makeWrapper, bash, bc, findutils, flac, lame, opusTools, procps, sox }:
 
-let
-  version = "1.7.5";
-in
-
 stdenv.mkDerivation rec {
-  name = "caudec-${version}";
+  pname = "caudec";
+  version = "1.7.5";
 
   src = fetchurl {
     url = "http://caudec.net/downloads/caudec-${version}.tar.gz";