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

treewide replacement of stdenv.mkDerivation rec { name = "*-${version}"; version = "*"; to pname
2019-08-15 12:41:18 +00:00
parent cff9e6429a
commit 46420bbaa3
4616 changed files with 5674 additions and 6081 deletions
--- a/pkgs/data/documentation/bgnet/default.nix
+++ b/pkgs/data/documentation/bgnet/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchurl, python, zip, fop }:

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

  src = fetchurl {
--- a/pkgs/data/documentation/man-pages/default.nix
+++ b/pkgs/data/documentation/man-pages/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:

 stdenv.mkDerivation rec {
-  name = "man-pages-${version}";
+  pname = "man-pages";
  version = "5.02";

  src = fetchurl {
-    url = "mirror://kernel/linux/docs/man-pages/${name}.tar.xz";
+    url = "mirror://kernel/linux/docs/man-pages/${pname}-${version}.tar.xz";
    sha256 = "1s4pdz2pwf0kvhdwx2s6lqn3xxzi38yz5jfyq5ymdmswc9gaiyn2";
  };

--- a/pkgs/data/documentation/mustache-spec/default.nix
+++ b/pkgs/data/documentation/mustache-spec/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchFromGitHub }:

 stdenv.mkDerivation rec {
-  name = "mustache-spec-${version}";
+  pname = "mustache-spec";
  version = "1.0.2";

  src = fetchFromGitHub {
--- a/pkgs/data/documentation/stdman/default.nix
+++ b/pkgs/data/documentation/stdman/default.nix
@@ -1,7 +1,7 @@
 { stdenv, curl, fetchFromGitHub }:

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

  src = fetchFromGitHub {
--- a/pkgs/data/documentation/zeal/default.nix
+++ b/pkgs/data/documentation/zeal/default.nix
@@ -3,7 +3,7 @@
 , libarchive, libXdmcp, libpthreadstubs, xcbutilkeysyms  }:

 mkDerivation rec {
-  name = "zeal-${version}";
+  pname = "zeal";
  version = "0.6.1";

  src = fetchFromGitHub {
--- a/pkgs/data/fonts/dina-pcf/default.nix
+++ b/pkgs/data/fonts/dina-pcf/default.nix
@@ -2,7 +2,7 @@

 stdenv.mkDerivation rec {
  version = "2.92";
-  name = "dina-font-pcf-${version}";
+  pname = "dina-font-pcf";

  src = fetchurl {
    url = "http://www.donationcoder.com/Software/Jibz/Dina/downloads/Dina.zip";
--- a/pkgs/data/fonts/dosemu-fonts/default.nix
+++ b/pkgs/data/fonts/dosemu-fonts/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, bdftopcf, mkfontdir, mkfontscale }:

 stdenv.mkDerivation rec {
-  name = "dosemu-fonts-${version}";
+  pname = "dosemu-fonts";
  version = "1.4.0";

  src = fetchurl {
--- a/pkgs/data/fonts/emojione/default.nix
+++ b/pkgs/data/fonts/emojione/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, inkscape, imagemagick, potrace, svgo, scfbuild }:

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

  src = fetchFromGitHub {
--- a/pkgs/data/fonts/gohufont/default.nix
+++ b/pkgs/data/fonts/gohufont/default.nix
@@ -3,11 +3,11 @@
 }:

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

  src = fetchurl {
-    url = "http://font.gohu.org/${name}.tar.gz";
+    url = "http://font.gohu.org/${pname}-${version}.tar.gz";
    sha256 = "10dsl7insnw95hinkcgmp9rx39lyzb7bpx5g70vswl8d6p4n53bm";
  };

--- a/pkgs/data/fonts/google-fonts/default.nix
+++ b/pkgs/data/fonts/google-fonts/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:

 stdenv.mkDerivation rec {
-  name = "google-fonts-${version}";
+  pname = "google-fonts";
  version = "2019-07-14";

  src = fetchFromGitHub {
--- a/pkgs/data/fonts/inconsolata/default.nix
+++ b/pkgs/data/fonts/inconsolata/default.nix
@@ -1,7 +1,7 @@
 { stdenv, google-fonts }:

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

  inherit (google-fonts) src version;

--- a/pkgs/data/fonts/inconsolata/lgc.nix
+++ b/pkgs/data/fonts/inconsolata/lgc.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchFromGitHub, fontforge}:

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

  src = fetchFromGitHub {
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
  installPhase = ''
    find . -name '*.ttf' -exec install -m444 -Dt $out/share/fonts/truetype {} \;
    find . -name '*.otf' -exec install -m444 -Dt $out/share/fonts/opentype {} \;
-    install -m444 -Dt $out/share/doc/${name} LICENSE README
+    install -m444 -Dt $out/share/doc/${pname}-${version} LICENSE README
  '';

  meta = with stdenv.lib; {
--- a/pkgs/data/fonts/input-fonts/default.nix
+++ b/pkgs/data/fonts/input-fonts/default.nix
@@ -1,7 +1,7 @@
 { stdenv, requireFile, unzip }:

 stdenv.mkDerivation rec {
-  name = "input-fonts-${version}";
+  pname = "input-fonts";
  version = "2017-08-10"; # date of the download and checksum

  src = requireFile {
--- a/pkgs/data/fonts/libre-caslon/default.nix
+++ b/pkgs/data/fonts/libre-caslon/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:

 stdenv.mkDerivation rec {
-  name = "libre-caslon-${version}";
+  pname = "libre-caslon";
  version = "1.002";

  srcs = [
@@ -26,10 +26,10 @@ stdenv.mkDerivation rec {

  installPhase = ''
    mkdir -p $out/share/fonts/opentype
-    mkdir -p $out/share/doc/${name}
+    mkdir -p $out/share/doc/${pname}-${version}
    cp -v "libre-caslon-text-${version}-src/fonts/OTF/"*.otf $out/share/fonts/opentype/
    cp -v "libre-caslon-display-${version}-src/fonts/OTF/"*.otf $out/share/fonts/opentype/
-    cp -v libre-caslon-text-${version}-src/README.md libre-caslon-text-${version}-src/FONTLOG.txt $out/share/doc/${name}
+    cp -v libre-caslon-text-${version}-src/README.md libre-caslon-text-${version}-src/FONTLOG.txt $out/share/doc/${pname}-${version}
  '';

  outputHashAlgo = "sha256";
--- a/pkgs/data/fonts/lobster-two/default.nix
+++ b/pkgs/data/fonts/lobster-two/default.nix
@@ -50,15 +50,15 @@ let
 in

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

    phases = ["installPhase"];

    installPhase = ''
      mkdir -p $out/share/fonts/opentype
-      mkdir -p $out/share/doc/${name}
-      cp -v ${fontlog.file} $out/share/doc/${name}/${fontlog.name}
+      mkdir -p $out/share/doc/${pname}-${version}
+      cp -v ${fontlog.file} $out/share/doc/${pname}-${version}/${fontlog.name}
      cp -v ${bold.file} $out/share/fonts/opentype/${bold.name}
      cp -v ${boldItalic.file} $out/share/fonts/opentype/${boldItalic.name}
      cp -v ${italic.file} $out/share/fonts/opentype/${italic.name}
--- a/pkgs/data/fonts/meslo-lg/default.nix
+++ b/pkgs/data/fonts/meslo-lg/default.nix
@@ -3,17 +3,17 @@
 stdenv.mkDerivation rec {
  version = "1.2.1";

-  name = "meslo-lg-${version}";
+  pname = "meslo-lg";

  meslo-lg = fetchurl {
    url="https://github.com/andreberg/Meslo-Font/blob/master/dist/v${version}/Meslo%20LG%20v${version}.zip?raw=true";
-    name="${name}";
+    name="${pname}-${version}";
    sha256="1l08mxlzaz3i5bamnfr49s2k4k23vdm64b8nz2ha33ysimkbgg6h";
  };

  meslo-lg-dz = fetchurl {
    url="https://github.com/andreberg/Meslo-Font/blob/master/dist/v${version}/Meslo%20LG%20DZ%20v${version}.zip?raw=true";
-    name="${name}-dz";
+    name="${pname}-${version}-dz";
    sha256="0lnbkrvcpgz9chnvix79j6fiz36wj6n46brb7b1746182rl1l875";
  };

--- a/pkgs/data/fonts/migmix/default.nix
+++ b/pkgs/data/fonts/migmix/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchzip }:

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

  srcs = [
--- a/pkgs/data/fonts/migu/default.nix
+++ b/pkgs/data/fonts/migu/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchzip }:

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

  srcs = [
--- a/pkgs/data/fonts/monoid/default.nix
+++ b/pkgs/data/fonts/monoid/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, python, fontforge }:

 stdenv.mkDerivation rec {
-  name = "monoid-${version}";
+  pname = "monoid";
  version = "2016-07-21";

  src = fetchFromGitHub {
--- a/pkgs/data/fonts/nerdfonts/default.nix
+++ b/pkgs/data/fonts/nerdfonts/default.nix
@@ -2,7 +2,7 @@

 stdenv.mkDerivation rec {
  version = "2.0.0";
-  name = "nerdfonts-${version}";
+  pname = "nerdfonts";
  src = fetchFromGitHub {
    owner = "ryanoasis";
    repo = "nerd-fonts";
--- a/pkgs/data/fonts/noto-fonts/tools.nix
+++ b/pkgs/data/fonts/noto-fonts/tools.nix
@@ -2,7 +2,7 @@

 pythonPackages.buildPythonPackage rec {
  version = "2017-09-25";
-  name = "nototools-${version}";
+  pname = "nototools";

  src = fetchFromGitHub {
    owner = "googlei18n";
--- a/pkgs/data/fonts/ricty/default.nix
+++ b/pkgs/data/fonts/ricty/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, google-fonts, migu, fontforge, which }:

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

  src = fetchurl {
--- a/pkgs/data/fonts/rictydiminished-with-firacode/default.nix
+++ b/pkgs/data/fonts/rictydiminished-with-firacode/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchgit, fontforge, pythonFull }:

 stdenv.mkDerivation rec {
-  name = "rictydiminished-with-firacode-${version}";
+  pname = "rictydiminished-with-firacode";
  version = "0.0.1";
  src = fetchgit {
    url = "https://github.com/hakatashi/RictyDiminished-with-FiraCode.git";
--- a/pkgs/data/fonts/roboto-mono/default.nix
+++ b/pkgs/data/fonts/roboto-mono/default.nix
@@ -5,7 +5,7 @@ let
  commit = "883939708704a19a295e0652036369d22469e8dc";
 in
 stdenv.mkDerivation rec {
-  name = "roboto-mono-${version}";
+  pname = "roboto-mono";
  version = "2016-01-11";

  srcs = [
--- a/pkgs/data/fonts/roboto-slab/default.nix
+++ b/pkgs/data/fonts/roboto-slab/default.nix
@@ -5,7 +5,7 @@ let
  commit = "883939708704a19a295e0652036369d22469e8dc";
 in
 stdenv.mkDerivation rec {
-  name = "roboto-slab-${version}";
+  pname = "roboto-slab";
  version = "2016-01-11";

  srcs = [
--- a/pkgs/data/fonts/terminus-font/default.nix
+++ b/pkgs/data/fonts/terminus-font/default.nix
@@ -2,11 +2,10 @@

 stdenv.mkDerivation rec {
  pname = "terminus-font";
-  version = "4.48";
-  name = "${pname}-${version}"; # set here for use in URL below
+  version = "4.48"; # set here for use in URL below

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

--- a/pkgs/data/fonts/tlwg/default.nix
+++ b/pkgs/data/fonts/tlwg/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoreconfHook, fontforge }:

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

  src = fetchFromGitHub {
--- a/pkgs/data/fonts/ucs-fonts/default.nix
+++ b/pkgs/data/fonts/ucs-fonts/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, mkfontdir, mkfontscale }:

 stdenv.mkDerivation rec {
-  name = "ucs-fonts-${version}";
+  pname = "ucs-fonts";
  version = "20090406";

  srcs = [
--- a/pkgs/data/fonts/unifont/default.nix
+++ b/pkgs/data/fonts/unifont/default.nix
@@ -1,16 +1,16 @@
 { stdenv, fetchurl, mkfontscale, mkfontdir }:

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

  ttf = fetchurl {
-    url = "mirror://gnu/unifont/${name}/${name}.ttf";
+    url = "mirror://gnu/unifont/${pname}-${version}/${pname}-${version}.ttf";
    sha256 = "10igjlf05d97h3vcggr2ahxmq9ljby4ypja2g4s9bvxs2w1si51p";
  };

  pcf = fetchurl {
-    url = "mirror://gnu/unifont/${name}/${name}.pcf.gz";
+    url = "mirror://gnu/unifont/${pname}-${version}/${pname}-${version}.pcf.gz";
    sha256 = "1cd1fnk3m7giqp099kynnjj4m7q00lqm4ybqb1vzd2wi3j4a1awf";
  };

--- a/pkgs/data/fonts/unscii/default.nix
+++ b/pkgs/data/fonts/unscii/default.nix
@@ -1,11 +1,10 @@
 {stdenv, fetchurl, perl, bdftopcf, perlPackages, fontforge, SDL, SDL_image}:
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
  pname = "unscii";
  version = "1.1";
  # or fetchFromGitHub(owner,repo,rev) or fetchgit(rev)
  src = fetchurl {
-    url = "http://pelulamu.net/${pname}/${name}-src.tar.gz";
+    url = "http://pelulamu.net/${pname}/${pname}-${version}-src.tar.gz";
    sha256 = "0qcxcnqz2nlwfzlrn115kkp3n8dd7593h762vxs6vfqm13i39lq1";
  };
  nativeBuildInputs = [perl bdftopcf perlPackages.TextCharWidth fontforge
--- a/pkgs/data/fonts/xits-math/default.nix
+++ b/pkgs/data/fonts/xits-math/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, python2Packages, fontforge }:

 stdenv.mkDerivation rec {
-  name = "xits-math-${version}";
+  pname = "xits-math";
  version = "1.200";

  src = fetchFromGitHub {
--- a/pkgs/data/icons/bibata-cursors/default.nix
+++ b/pkgs/data/icons/bibata-cursors/default.nix
@@ -1,7 +1,7 @@
 { fetchFromGitHub, gnome-themes-extra, inkscape, stdenv, xcursorgen }:

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

  src = fetchFromGitHub {
--- a/pkgs/data/icons/elementary-xfce-icon-theme/default.nix
+++ b/pkgs/data/icons/elementary-xfce-icon-theme/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, pkgconfig, gdk-pixbuf, optipng, librsvg, gtk3, hicolor-icon-theme }:

 stdenv.mkDerivation rec {
-  name = "elementary-xfce-icon-theme-${version}";
+  pname = "elementary-xfce-icon-theme";
  version = "0.13.1";

  src = fetchFromGitHub {
--- a/pkgs/data/icons/faba-mono-icons/default.nix
+++ b/pkgs/data/icons/faba-mono-icons/default.nix
@@ -1,7 +1,6 @@
 { stdenv, fetchFromGitHub, autoreconfHook, gtk3, moka-icon-theme }:

 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
  pname = "faba-mono-icons";
  version = "2016-04-30";

--- a/pkgs/data/icons/iconpack-obsidian/default.nix
+++ b/pkgs/data/icons/iconpack-obsidian/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, gtk3 }:

 stdenv.mkDerivation rec {
-  name = "iconpack-obsidian-${version}";
+  pname = "iconpack-obsidian";
  version = "4.3";

  src = fetchFromGitHub {
--- a/pkgs/data/icons/maia-icon-theme/default.nix
+++ b/pkgs/data/icons/maia-icon-theme/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitLab, cmake, extra-cmake-modules, gtk3, kdeFrameworks, hicolor-icon-theme }:

 stdenv.mkDerivation rec {
-  name = "maia-icon-theme-${version}";
+  pname = "maia-icon-theme";
  version = "2018-02-24";

  src = fetchFromGitLab {
--- a/pkgs/data/icons/moka-icon-theme/default.nix
+++ b/pkgs/data/icons/moka-icon-theme/default.nix
@@ -1,7 +1,6 @@
 { stdenv, fetchFromGitHub, meson, ninja, gtk3, python3, faba-icon-theme }:

 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
  pname = "moka-icon-theme";
  version = "5.4.0";

--- a/pkgs/data/icons/numix-icon-theme/default.nix
+++ b/pkgs/data/icons/numix-icon-theme/default.nix
@@ -1,7 +1,6 @@
 { stdenv, fetchFromGitHub, gtk3, hicolor-icon-theme }:

 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
  pname = "numix-icon-theme";
  version = "18.07.17";

--- a/pkgs/data/icons/paper-icon-theme/default.nix
+++ b/pkgs/data/icons/paper-icon-theme/default.nix
@@ -1,7 +1,6 @@
 { stdenv, fetchFromGitHub, meson, ninja, gtk3, python3 }:

 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
  pname = "paper-icon-theme";
  version = "2018-06-24";

--- a/pkgs/data/icons/vanilla-dmz/default.nix
+++ b/pkgs/data/icons/vanilla-dmz/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchzip, xorg }:

 stdenv.mkDerivation rec {
-  name = "vanilla-dmz-${version}";
+  pname = "vanilla-dmz";
  version = "0.4.4";
  src = fetchzip {
    url = "http://ftp.de.debian.org/debian/pool/main/d/dmz-cursor-theme/dmz-cursor-theme_${version}.tar.gz";
--- a/pkgs/data/misc/combinatorial_designs/default.nix
+++ b/pkgs/data/misc/combinatorial_designs/default.nix
@@ -3,7 +3,7 @@
 }:

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

  src = fetchurl {
--- a/pkgs/data/misc/conway_polynomials/default.nix
+++ b/pkgs/data/misc/conway_polynomials/default.nix
@@ -4,7 +4,7 @@
 }:

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

  pythonEnv = python.withPackages (ps: with ps; [ six ]);
--- a/pkgs/data/misc/elliptic_curves/default.nix
+++ b/pkgs/data/misc/elliptic_curves/default.nix
@@ -6,7 +6,6 @@
 stdenv.mkDerivation rec {
  pname = "elliptic_curves";
  version = "0.8";
-  name = "${pname}-${version}";

  src = fetchurl {
    url = "mirror://sageupstream/${pname}/${pname}-${version}.tar.bz2";
--- a/pkgs/data/misc/geolite-legacy/default.nix
+++ b/pkgs/data/misc/geolite-legacy/default.nix
@@ -7,7 +7,7 @@ let
  };
 in
 stdenv.mkDerivation rec {
-  name = "geolite-legacy-${version}";
+  pname = "geolite-legacy";
  version = "2017-12-02";

  srcGeoIP = fetchDB
--- a/pkgs/data/misc/graphs/default.nix
+++ b/pkgs/data/misc/graphs/default.nix
@@ -5,7 +5,6 @@
 stdenv.mkDerivation rec {
  pname = "graphs";
  version = "20161026";
-  name = "${pname}-${version}";

  src = fetchurl {
    url = "mirror://sageupstream/${pname}/${pname}-${version}.tar.bz2";
--- a/pkgs/data/misc/libkkc-data/default.nix
+++ b/pkgs/data/misc/libkkc-data/default.nix
@@ -3,10 +3,9 @@
 stdenv.mkDerivation rec {
  pname = "libkkc-data";
  version = "0.2.7";
-  name = "${pname}-${version}";

  src = fetchurl {
-    url = "${meta.homepage}/releases/download/v${libkkc.version}/${name}.tar.xz";
+    url = "${meta.homepage}/releases/download/v${libkkc.version}/${pname}-${version}.tar.xz";
    sha256 = "16avb50jasq2f1n9xyziky39dhlnlad0991pisk3s11hl1aqfrwy";
  };

--- a/pkgs/data/misc/pari-galdata/default.nix
+++ b/pkgs/data/misc/pari-galdata/default.nix
@@ -4,7 +4,7 @@

 stdenv.mkDerivation rec {
  version = "20080411";
-  name = "pari-galdata-${version}";
+  pname = "pari-galdata";

  src = fetchurl {
    url = "http://pari.math.u-bordeaux.fr/pub/pari/packages/galdata.tgz";
--- a/pkgs/data/misc/pari-seadata-small/default.nix
+++ b/pkgs/data/misc/pari-seadata-small/default.nix
@@ -4,7 +4,7 @@

 stdenv.mkDerivation rec {
  version = "20090618";
-  name = "pari-seadata-small-${version}";
+  pname = "pari-seadata-small";

  src = fetchurl {
    url = "http://pari.math.u-bordeaux.fr/pub/pari/packages/seadata-small.tgz";
--- a/pkgs/data/misc/polytopes_db/default.nix
+++ b/pkgs/data/misc/polytopes_db/default.nix
@@ -5,7 +5,6 @@
 stdenv.mkDerivation rec {
  pname = "polytopes_db";
  version = "20170220";
-  name = "${pname}-${version}";

  src = fetchurl {
    url = "mirror://sageupstream/${pname}/${pname}-${version}.tar.bz2";
--- a/pkgs/data/misc/scowl/default.nix
+++ b/pkgs/data/misc/scowl/default.nix
@@ -3,7 +3,6 @@
 }:

 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
  pname = "scowl";
  version = "2018.04.16";

--- a/pkgs/data/misc/sound-theme-freedesktop/default.nix
+++ b/pkgs/data/misc/sound-theme-freedesktop/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, intltool }:

 stdenv.mkDerivation rec {
-  name = "sound-theme-freedesktop-${version}";
+  pname = "sound-theme-freedesktop";
  version = "0.8";

  src = fetchurl {
    sha256 = "054abv4gmfk9maw93fis0bf605rc56dah7ys5plc4pphxqh8nlfb";
-    url = "https://people.freedesktop.org/~mccann/dist/${name}.tar.bz2";
+    url = "https://people.freedesktop.org/~mccann/dist/${pname}-${version}.tar.bz2";
  };

  nativeBuildInputs = [ intltool ];
--- a/pkgs/data/misc/tzdata/default.nix
+++ b/pkgs/data/misc/tzdata/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, buildPackages }:

 stdenv.mkDerivation rec {
-  name = "tzdata-${version}";
+  pname = "tzdata";
  version = "2019a";

  srcs =
--- a/pkgs/data/misc/xorg-rgb/default.nix
+++ b/pkgs/data/misc/xorg-rgb/default.nix
@@ -1,6 +1,5 @@
 {stdenv, fetchurl, pkgconfig, xorgproto}:
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
  pname = "rgb";
  version = "1.0.6";

--- a/pkgs/data/themes/matcha/default.nix
+++ b/pkgs/data/themes/matcha/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, gdk-pixbuf, librsvg, gtk-engine-murrine }:

 stdenv.mkDerivation rec {
-  name = "matcha-${version}";
+  pname = "matcha";
  version = "2019-06-22";

  src = fetchFromGitHub {
--- a/pkgs/data/themes/nordic-polar/default.nix
+++ b/pkgs/data/themes/nordic-polar/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, gtk-engine-murrine }:

 stdenv.mkDerivation rec {
-  name = "nordic-polar-${version}";
+  pname = "nordic-polar";
  version = "1.5.0";

  srcs = [
--- a/pkgs/data/themes/nordic/default.nix
+++ b/pkgs/data/themes/nordic/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, gtk-engine-murrine }:

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

  srcs = [