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

treewide replacement of stdenv.mkDerivation rec { name = "*-${version}"; version = "*"; to pname
2019-08-15 13:41:18 +01:00
parent cff9e6429a
commit 46420bbaa3
4616 changed files with 5674 additions and 6081 deletions
@@ -9,7 +9,7 @@ let boost_static = boost165.override {
 };
 in stdenv.mkDerivation rec {

-  name = "appleseed-${version}";
+  pname = "appleseed";
  version = "2.0.5-beta";

  src = fetchFromGitHub {
@@ -1,11 +1,10 @@
 { stdenv, fetchurl }:

 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
  version = "0.99";
  pname = "barcode";
  src = fetchurl {
-    url = "mirror://gnu/${pname}/${name}.tar.xz";
+    url = "mirror://gnu/${pname}/${pname}-${version}.tar.xz";
    sha256 = "1indapql5fjz0bysyc88cmc54y8phqrbi7c76p71fgjp45jcyzp8";
  };

@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, python, pkgconfig, imagemagick, wafHook }:

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

  src = fetchFromGitHub {
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, libpng, bison, flex, ffmpeg }:

 stdenv.mkDerivation rec {
-  name = "cfdg-${version}";
+  pname = "cfdg";
  version = "3.0.9";
  src = fetchurl {
    sha256 = "1jqpinz6ri4a2l04mf2z1ljalkdk1m07hj47lqkh8gbf2slfs0jl";
@@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
    mkdir -p $out/bin
    cp cfdg $out/bin/

-    mkdir -p $out/share/doc/${name}
-    cp *.txt $out/share/doc/${name}
+    mkdir -p $out/share/doc/${pname}-${version}
+    cp *.txt $out/share/doc/${pname}-${version}
  '';

  meta = with stdenv.lib; {
@@ -1,6 +1,6 @@
 {stdenv, fetchFromGitHub, mono}:
 stdenv.mkDerivation rec {
-  name = "convchain-${version}";
+  pname = "convchain";
  version = "0.0pre20160901";
  src = fetchFromGitHub {
    owner = "mxgmn";
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, cmake, imagemagick }:

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

  src = fetchurl {
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:

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

  src = fetchurl {
-    url = "https://ece.uwaterloo.ca/~aplevich/dpic/${name}.tar.gz";
+    url = "https://ece.uwaterloo.ca/~aplevich/dpic/${pname}-${version}.tar.gz";
    sha256 = "0iwwf8shgm8n4drz8mndvk7jga93yy8plnyby3lgk8376g5ps6cz";
  };

@@ -3,11 +3,11 @@
 , help2man, pkgconfig, perl, texlive }:

 stdenv.mkDerivation rec {
-  name = "enblend-enfuse-${version}";
+  pname = "enblend-enfuse";
  version = "4.2";

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

@@ -2,7 +2,7 @@

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

  src = fetchurl {
    url = "http://ftp.de.debian.org/debian/pool/main/e/epstool/epstool_${version}+repack.orig.tar.gz";
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, python2Packages }:

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

  src = fetchFromGitHub {
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
  '';

  installPhase = ''
-    install -v -m644 -D README.rst $out/share/doc/${name}/README.rst
+    install -v -m644 -D README.rst $out/share/doc/${pname}-${version}/README.rst
    install -v -m755 -D facedetect $out/bin/facedetect
    wrapPythonPrograms
  '';
@@ -2,7 +2,7 @@
  , python, numpy, scipy, h5py, scikitlearn, pillow
  }:
 stdenv.mkDerivation rec {
-  name = "fast-neural-doodle-${version}";
+  pname = "fast-neural-doodle";
  version = "0.0pre2016-07-01";
  buildInputs = [
    torch torch-hdf5 python numpy h5py scikitlearn scipy pillow
@@ -10,11 +10,11 @@
 }:

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

  src = fetchurl {
-    url = "mirror://savannah/fbi-improved/${name}-trunk.tar.gz";
+    url = "mirror://savannah/fbi-improved/${pname}-${version}-trunk.tar.gz";
    sha256 = "124b7c4flx5ygmy5sqq0gpvxqzafnknbcj6f45ddnbdxik9lazzp";
  };

@@ -1,7 +1,6 @@
 {stdenv, fetchFromGitHub, zlib, libpng, libxml2, libjpeg }:

 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
  pname = "flam3";
  version = "3.1.1-${stdenv.lib.strings.substring 0 7 rev}";
  rev = "e0801543538451234d7a8a240ba3b417cbda5b21";
@@ -2,7 +2,7 @@

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

  src = fetchurl {
    url = "http://www.ggobi.org/downloads/ggobi-${version}.tar.bz2";
@@ -1,7 +1,6 @@
 {stdenv, fetchgit, cmake, libGLU_combined, xorg }:

 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
  pname = "glee";
  rev = "f727ec7463d514b6279981d12833f2e11d62b33d";
  version = "20170205-${stdenv.lib.strings.substring 0 7 rev}";
@@ -2,7 +2,7 @@
  python27, wayland, udev, mesa, wafHook }:

 stdenv.mkDerivation rec {
-  name = "glmark2-${version}";
+  pname = "glmark2";
  version = "2017-09-01";

  src = fetchFromGitHub {
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, libGL, libX11 }:

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

  src = fetchurl {
@@ -4,7 +4,7 @@
 }:

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

  src = fetchFromGitHub {
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, SDL }:

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

  src = fetchurl {
-    url = "http://www.pelulamu.net/ibniz/${name}.tar.gz";
+    url = "http://www.pelulamu.net/ibniz/${pname}-${version}.tar.gz";
    sha256 = "10b4dka8zx7y84m1a58z9j2vly8mz9aw9wn8z9vx9av739j95wp2";
  };

@@ -3,7 +3,7 @@
 let deps = stdenv.lib.makeBinPath [ curl gnugrep libnotify scrot which xclip ];
 in stdenv.mkDerivation rec {
  version = "1.7.4";
-  name = "imgur-screenshot-${version}";
+  pname = "imgur-screenshot";

  src = fetchFromGitHub {
    owner = "jomo";
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, libjpeg }:

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

  src = fetchurl {
-    url = "http://www.sentex.net/~mwandel/jhead/${name}.tar.gz";
+    url = "http://www.sentex.net/~mwandel/jhead/${pname}-${version}.tar.gz";
    sha256 = "1hn0yqcicq3qa20h1g313l1a671r8mccpb9gz0w1056r500lw6c2";
  };

@@ -24,11 +24,11 @@ stdenv.mkDerivation rec {
    mkdir -p \
      $out/bin \
      $out/man/man1 \
-      $out/share/doc/${name}
+      $out/share/doc/${pname}-${version}

    cp -v jhead $out/bin
    cp -v jhead.1 $out/man/man1
-    cp -v *.txt $out/share/doc/${name}
+    cp -v *.txt $out/share/doc/${pname}-${version}
  '';

  meta = with stdenv.lib; {
@@ -2,7 +2,7 @@

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

  src = fetchFromGitHub {
    repo = "lepton";
@@ -2,11 +2,11 @@
 , libGLU_combined, boost, glm, freetype }:

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

  src = fetchurl {
-    url = "https://github.com/acaudwell/Logstalgia/releases/download/${name}/${name}.tar.gz";
+    url = "https://github.com/acaudwell/Logstalgia/releases/download/${pname}-${version}/${pname}-${version}.tar.gz";
    sha256 = "1agwjlwzp1c86hqb1p7rmzqzhd3wpnyh8whsfq4sbx01wj0l0gzd";
  };

@@ -14,7 +14,7 @@ let boost_static = boost165.override {
    };

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

  src = fetchFromGitHub {
@@ -4,7 +4,7 @@
 }:

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

  src = fetchFromGitHub {
@@ -1,6 +1,6 @@
 {stdenv, fetchFromGitHub, torch, loadcaffe, fetchurl, bash}:
 stdenv.mkDerivation rec {
-  name = "neural-style-${version}";
+  pname = "neural-style";
  version = "0.0pre2016.08.15";
  buildInputs = [torch loadcaffe];
  src = fetchFromGitHub {
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, qmake, qtbase, qttools, substituteAll, libGLU, wrapQtAppsHook }:

 stdenv.mkDerivation rec {
-  name = "nifskope-${version}";
+  pname = "nifskope";
  version = "2.0.dev7";

  src = fetchFromGitHub {
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, imagemagick, libpng }:

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

  src = fetchurl {
@@ -2,7 +2,7 @@
 , cairo, gtk2, poppler }:

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

  src = fetchFromGitHub {
@@ -3,7 +3,6 @@

 stdenv.mkDerivation rec {
  pname = "pdftag";
-  name = "${pname}-${version}";
  version = "1.0.5";

  src = fetchFromGitHub {
@@ -2,7 +2,6 @@

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

  src = fetchFromGitHub {
@@ -4,12 +4,11 @@
 }:

 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
  pname = "pfstools";
  version = "2.1.0";

  src = fetchurl {
-    url = "mirror://sourceforge/${pname}/${version}/${name}.tgz";
+    url = "mirror://sourceforge/${pname}/${version}/${pname}-${version}.tgz";
    sha256 = "04rlb705gmdiphcybf9dyr0d5lla2cfs3c308zz37x0vwi445six";
  };

@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, pkgconfig, libpng, zlib, lcms2 }:

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

  src = fetchFromGitHub {
@@ -3,7 +3,7 @@
 }:

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

  src = fetchFromGitHub {
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:

 stdenv.mkDerivation rec {
-  name = "qrcode-git-${version}";
+  pname = "qrcode-git";
  version = "20160804";

  src = fetchFromGitHub {
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, qmake, qtbase }:

 stdenv.mkDerivation rec {
-  name = "rocket-${version}";
+  pname = "rocket";
  version = "2018-06-09";

  src = fetchFromGitHub {
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, diffutils, gd, pkgconfig }:

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

  src = fetchFromGitHub {
@@ -2,12 +2,12 @@
 , dbus, libconfuse, libjpeg, sane-backends, systemd }:

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

  src = fetchurl {
    sha256 = "0pvy4qirfjdfm8aj6x5rkbgl7hk3jfa2s21qkk8ic5dqfjjab75n";
-    url = "mirror://sourceforge/scanbd/${name}.tgz";
+    url = "mirror://sourceforge/scanbd/${pname}-${version}.tgz";
  };

  nativeBuildInputs = [ pkgconfig ];
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, libpng, netpbm }:

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

  src = fetchurl {
@@ -2,7 +2,7 @@

 stdenv.mkDerivation rec {

-  name = "structure-synth-${version}";
+  pname = "structure-synth";
  version = "v1.5";

  src = fetchurl {
@@ -4,7 +4,6 @@
 }:

 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
  pname = "swfdec";
  version = "0.8.4";

@@ -1,6 +1,6 @@
 {stdenv, fetchFromGitHub, mono}:
 stdenv.mkDerivation rec {
-  name = "syntex-${version}";
+  pname = "syntex";
  version = "0.0pre20160915";
  src = fetchFromGitHub {
    owner = "mxgmn";
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, libav, libxslt }:

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

  src = fetchurl {
-    url = "https://www.flameeyes.eu/files/${name}.tar.xz";
+    url = "https://www.flameeyes.eu/files/${pname}-${version}.tar.xz";
    sha256 = "0c5rbkxbmy9k8vxjh4cv0bgnqd3wqc99yzw215vkyjslvbsq8z13";
  };

@@ -9,7 +9,7 @@
 }:

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

  src = fetchFromGitHub {
@@ -2,7 +2,7 @@
  glslang, pkgconfig, xlibsWrapper, libxcb, libXrandr, wayland }:

 stdenv.mkDerivation rec {
-  name = "vulkan-tools-${version}";
+  pname = "vulkan-tools";
  version = "1.1.106.0";

  src = fetchFromGitHub {
@@ -3,7 +3,7 @@
 }:

 buildGoModule rec {
-  name = "wallutils-${version}";
+  pname = "wallutils";
  version = "5.8.1";

  src = fetchFromGitHub {
@@ -1,6 +1,6 @@
 {stdenv, fetchFromGitHub, mono}:
 stdenv.mkDerivation rec {
-  name = "wavefunctioncollapse-${version}";
+  pname = "wavefunctioncollapse";
  version = "0.0pre20170130";
  src = fetchFromGitHub {
    owner = "mxgmn";
@@ -1,7 +1,7 @@
 { stdenv, fetchsvn, jre, makeWrapper }:

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

  src = fetchsvn {
@@ -3,7 +3,7 @@

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

  src = fetchFromGitHub {
    owner  = "wkhtmltopdf";
@@ -6,7 +6,7 @@

 stdenv.mkDerivation rec {

-    name = "yafaray-core-${version}";
+    pname = "yafaray-core";
    version = "3.3.0";

    src = fetchFromGitHub {
@@ -2,7 +2,7 @@
  maim, slop, ffmpeg, byzanz, libnotify, xdpyinfo }:

 stdenv.mkDerivation rec {
-  name = "yaxg-${version}";
+  pname = "yaxg";
  version = "unstable-2018-05-03";

  src = fetchFromGitHub {
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, jre }:
 stdenv.mkDerivation rec {
-  name = "zxing-${version}";
+  pname = "zxing";
  version = "3.1.0";
  # Maven builds are hard to get right
  core_jar = fetchurl {