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
@@ -2,7 +2,7 @@

 stdenv.mkDerivation rec {
  version = "0.2.6";
-  name = "cups-pk-helper-${version}";
+  pname = "cups-pk-helper";

  src = fetchurl {
    url = "https://www.freedesktop.org/software/cups-pk-helper/releases/cups-pk-helper-${version}.tar.xz";
@@ -9,7 +9,7 @@

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

  # After 2.2.6, CUPS requires headers only available in macOS 10.12+
  version = if stdenv.isDarwin then "2.2.6" else "2.2.11";
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake, zlib, cups }:

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

  src = fetchFromGitHub {
@@ -2,7 +2,7 @@
 , withDebug ? false }:

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

  version = "5.30";

@@ -7,7 +7,7 @@
   file included in the tarball */

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

  /* important note about versions: cnijfilter packages seem to use
     versions in a non-standard way.  the version indicates which
@@ -12,7 +12,7 @@ let arch =
    else throw "Unsupported system ${stdenv.hostPlatform.system}";

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

  /* important note about versions: cnijfilter packages seem to use
     versions in a non-standard way.  the version indicates which
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchurl, cups, ... }:

 stdenv.mkDerivation rec {
-  name = "cups-dymo-${version}";
+  pname = "cups-dymo";
  version = "1.4.0.5";

  # exposed version and 'real' version may differ
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, perl }:

 stdenv.mkDerivation rec {
-  name = "cups-toshiba-estudio-${version}";
+  pname = "cups-toshiba-estudio";
  version = "7.89";

  src = fetchurl {
@@ -6,7 +6,7 @@ let
         else throw "Unsupported system: ${stdenv.hostPlatform.system}";
 in
 stdenv.mkDerivation rec {
-  name = "fxlinuxprint-${version}";
+  pname = "fxlinuxprint";
  version = "1.1.2-1";

  src = fetchzip {
@@ -14,7 +14,7 @@ let pythonEnv = python2.buildEnv.override {
 };

 in stdenv.mkDerivation rec {
-  name    = "cups-googlecloudprint-${version}";
+  pname = "cups-googlecloudprint";
  version = "20160502";

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

 stdenv.mkDerivation rec {
-  name = "hll2390dw-cups-${version}";
+  pname = "hll2390dw-cups";
  version = "4.0.0-1";

  src = fetchurl {
@@ -10,7 +10,7 @@ let
 in

 stdenv.mkDerivation rec {
-  name = "cups-kyocera-${version}";
+  pname = "cups-kyocera";
  version = "1.1203";

  dontPatchELF = true;
@@ -15,7 +15,7 @@ let
  debRegion = if region == "EU" then "EU." else "";
 in
 stdenv.mkDerivation rec {
-  name = "cups-kyodialog3-${version}";
+  pname = "cups-kyodialog3";
  version = "8.1601";

  dontStrip = true;
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, mfcj470dwlpr, makeWrapper}:

 stdenv.mkDerivation rec {
-  name = "mfcj470dw-cupswrapper-${version}";
+  pname = "mfcj470dw-cupswrapper";
  version = "3.0.0-1";

  src = fetchurl {
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, cups, dpkg, ghostscript, a2ps, coreutils, gnused, gawk, file, makeWrapper }:

 stdenv.mkDerivation rec {
-  name = "mfcj470dw-cupswrapper-${version}";
+  pname = "mfcj470dw-cupswrapper";
  version = "3.0.0-1";

  src = fetchurl {
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, mfcj6510dwlpr, makeWrapper}:

 stdenv.mkDerivation rec {
-  name = "mfcj6510dw-cupswrapper-${version}";
+  pname = "mfcj6510dw-cupswrapper";
  version = "3.0.0-1";

  src = fetchurl {
@@ -20,7 +20,7 @@
 # The user can run brprintconf_mfcj6510dw in the shell.

 stdenv.mkDerivation rec {
-  name = "mfcj6510dwlpr-${version}";
+  pname = "mfcj6510dwlpr";
  version = "3.0.0-1";

  src = fetchurl {
@@ -1,11 +1,11 @@
 { coreutils, dpkg, fetchurl, ghostscript, gnugrep, gnused, makeWrapper, perl, stdenv, which }:

 stdenv.mkDerivation rec {
-  name = "mfcl2700dnlpr-${version}";
+  pname = "mfcl2700dnlpr";
  version = "3.2.0-1";

  src = fetchurl {
-    url = "https://download.brother.com/welcome/dlf102085/${name}.i386.deb";
+    url = "https://download.brother.com/welcome/dlf102085/${pname}-${version}.i386.deb";
    sha256 = "170qdzxlqikzvv2wphvfb37m19mn13az4aj88md87ka3rl5knk4m";
  };

@@ -1,11 +1,11 @@
 { stdenv, fetchurl, dpkg, makeWrapper, coreutils, gnugrep, gnused, perl, mfcl2720dwlpr }:

 stdenv.mkDerivation rec {
-  name = "mfcl2720dwcupswrapper-${version}";
+  pname = "mfcl2720dwcupswrapper";
  version = "3.2.0-1";

  src = fetchurl {
-    url = "https://download.brother.com/welcome/dlf101802/${name}.i386.deb";
+    url = "https://download.brother.com/welcome/dlf101802/${pname}-${version}.i386.deb";
    sha256 = "6d131926ce22c51b1854d2b91e426cc7ecbf5d6dabd698ef51a417090e35c598";
  };

@@ -1,11 +1,11 @@
 { pkgs, stdenv, fetchurl, dpkg, makeWrapper, coreutils, ghostscript, gnugrep, gnused, which, perl }:

 stdenv.mkDerivation rec {
-  name = "mfcl2720dwlpr-${version}";
+  pname = "mfcl2720dwlpr";
  version = "3.2.0-1";

  src = fetchurl {
-    url = "https://download.brother.com/welcome/dlf101801/${name}.i386.deb";
+    url = "https://download.brother.com/welcome/dlf101801/${pname}-${version}.i386.deb";
    sha256 = "088217e9ad118ec1e7f3d3f8f60f3bd839fe2c7d7c1136b249e9ac648dc742af";
  };

@@ -1,11 +1,11 @@
 { stdenv, fetchurl, dpkg, makeWrapper, coreutils, gnugrep, gnused, perl, mfcl2740dwlpr }:

 stdenv.mkDerivation rec {
-  name = "mfcl2740dwcupswrapper-${version}";
+  pname = "mfcl2740dwcupswrapper";
  version = "3.2.0-1";

  src = fetchurl {
-    url = "https://download.brother.com/welcome/dlf101726/${name}.i386.deb";
+    url = "https://download.brother.com/welcome/dlf101726/${pname}-${version}.i386.deb";
    sha256 = "078453e19f20ab6c7fc4d63c3e09f162f3d1410c04c23a294b6ffbd720b35ffb";
  };

@@ -1,11 +1,11 @@
 { pkgsi686Linux, stdenv, fetchurl, dpkg, makeWrapper, coreutils, ghostscript, gnugrep, gnused, which, perl }:

 stdenv.mkDerivation rec {
-  name = "mfcl2740dwlpr-${version}";
+  pname = "mfcl2740dwlpr";
  version = "3.2.0-1";

  src = fetchurl {
-    url = "https://download.brother.com/welcome/dlf101727/${name}.i386.deb";
+    url = "https://download.brother.com/welcome/dlf101727/${pname}-${version}.i386.deb";
    sha256 = "10a2bc672bd54e718b478f3afc7e47d451557f7d5513167d3ad349a3d00bffaf";
  };

@@ -2,11 +2,11 @@
 mfcl8690cdwlpr, perl, stdenv}:

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

  src = fetchurl {
-    url = "http://download.brother.com/welcome/dlf103250/${name}.i386.deb";
+    url = "http://download.brother.com/welcome/dlf103250/${pname}-${version}.i386.deb";
    sha256 = "1bl9r8mmj4vnanwpfjqgq3c9lf2v46wp5k6r2n9iqprf7ldd1kb2";
  };

@@ -2,11 +2,11 @@
 makeWrapper, perl, pkgs, stdenv, which }:

 stdenv.mkDerivation rec {
-  name = "mfcl8690cdwlpr-${version}";
+  pname = "mfcl8690cdwlpr";
  version = "1.3.0-0";

  src = fetchurl {
-    url = "http://download.brother.com/welcome/dlf103241/${name}.i386.deb";
+    url = "http://download.brother.com/welcome/dlf103241/${pname}-${version}.i386.deb";
    sha256 = "0x8zd4b1psmw1znp2ibncs37xm5mljcy9yza2rx8jm8lp0a3l85v";
  };

@@ -7,7 +7,7 @@ let
      else "i386";

 in stdenv.mkDerivation rec {
-  name = "samsung-unified-linux-driver-${version}";
+  pname = "samsung-unified-linux-driver";
  version = "1.00.36";

  src = fetchurl {
@@ -7,7 +7,7 @@ let
      else "i386";

 in stdenv.mkDerivation rec {
-  name = "samsung-unified-linux-driver-${version}";
+  pname = "samsung-unified-linux-driver";
  version = "1.00.37";

  src = fetchurl {
@@ -18,7 +18,7 @@
 let
  cups' = stdenv.lib.getLib cups;
 in stdenv.mkDerivation rec {
-  name = "samsung-UnifiedLinuxDriver-${version}";
+  pname = "samsung-UnifiedLinuxDriver";
  version = "4.00.39";

  src = fetchurl {
@@ -20,7 +20,7 @@ let
  appendPath = if stdenv.hostPlatform.system == "x86_64-linux" then "64" else "";
  libPath = stdenv.lib.makeLibraryPath [ cups libusb ] + ":$out/lib:${stdenv.cc.cc.lib}/lib${appendPath}";
 in stdenv.mkDerivation rec {
-  name = "samsung-UnifiedLinuxDriver-${version}";
+  pname = "samsung-UnifiedLinuxDriver";
  version = "4.01.17";

  src = fetchurl {
@@ -3,7 +3,6 @@
 stdenv.mkDerivation rec {
  pname = "cups-zj-58";
  version = "2018-02-22";
-  name = "${pname}-${version}";

  src = fetchFromGitHub {
    owner = "klirichek";
@@ -8,11 +8,11 @@ let
  binPath = stdenv.lib.makeBinPath [ coreutils gnused bc gawk gnugrep which ];

 in stdenv.mkDerivation rec {
-  name = "cups-filters-${version}";
+  pname = "cups-filters";
  version = "1.25.0";

  src = fetchurl {
-    url = "https://openprinting.org/download/cups-filters/${name}.tar.xz";
+    url = "https://openprinting.org/download/cups-filters/${pname}-${version}.tar.xz";
    sha256 = "1laiscq8yvynw862calkgbz9irrdkmd5l821q6a6wik1ifd186c1";
  };