misc: replace name with pname&version

5 files changed, 18 insertions, 13 deletions

diff --git a/pkgs/misc/drivers/epson-workforce-635-nx625-series/default.nix b/pkgs/misc/drivers/epson-workforce-635-nx625-series/default.nix
index e06a0c911624..73d88ad19c24 100644
--- a/pkgs/misc/drivers/epson-workforce-635-nx625-series/default.nix
+++ b/pkgs/misc/drivers/epson-workforce-635-nx625-series/default.nix
@@ -9,14 +9,14 @@ let
     driver = "epson-inkjet-printer-workforce-635-nx625-series-1.0.1";
   };
 in stdenv.mkDerivation rec {
-  name = "epson-inkjet-printer-workforce-635-nx625-series";
+  pname = "epson-inkjet-printer-workforce-635-nx625-series";
   version = "1.0.1";
 
   src = fetchurl {
     # NOTE: Don't forget to update the webarchive link too!
     urls = [
-      "https://download.ebz.epson.net/dsc/op/stable/SRPMS/${name}-${version}-1lsb3.2.src.rpm"
-      "https://web.archive.org/web/https://download.ebz.epson.net/dsc/op/stable/SRPMS/${name}-${version}-1lsb3.2.src.rpm"
+      "https://download.ebz.epson.net/dsc/op/stable/SRPMS/${pname}-${version}-1lsb3.2.src.rpm"
+      "https://web.archive.org/web/https://download.ebz.epson.net/dsc/op/stable/SRPMS/${pname}-${version}-1lsb3.2.src.rpm"
     ];
     sha256 = "19nb2h0y9rvv6rg7j262f8sqap9kjvz8kmisxnjg1w0v19zb9zf2";
   };
@@ -40,7 +40,7 @@ in stdenv.mkDerivation rec {
     let
       filterdir = "$out/cups/lib/filter";
       docdir  = "$out/share/doc";
-      ppddir  = "$out/share/cups/model/${name}";
+      ppddir  = "$out/share/cups/model/${pname}";
       libdir =
         if stdenv.system == "x86_64-linux"    then "lib64"
         else if stdenv.system == "i686_linux" then "lib"
@@ -51,7 +51,7 @@ in stdenv.mkDerivation rec {
 
       cd ../${srcdirs.driver}
       for ppd in ppds/*; do
-          substituteInPlace "$ppd" --replace '/opt/${name}' "$out"
+          substituteInPlace "$ppd" --replace '/opt/${pname}' "$out"
           gzip -c "$ppd" > "${ppddir}/''${ppd#*/}"
       done
       cp COPYING.EPSON README "${docdir}"
@@ -91,7 +91,7 @@ in stdenv.mkDerivation rec {
       To use the driver adjust your configuration.nix file:
         services.printing = {
           enable = true;
-          drivers = [ pkgs.${name} ];
+          drivers = [ pkgs.${pname} ];
         };
     '';
     downloadPage = "https://download.ebz.epson.net/dsc/du/02/DriverDownloadInfo.do?LG2=EN&CN2=&DSCMI=16857&DSCCHK=4334d3487503d7f916ccf5d58071b05b7687294f";
diff --git a/pkgs/misc/drivers/foomatic-filters/default.nix b/pkgs/misc/drivers/foomatic-filters/default.nix
index db1da676a515..5804eb60930d 100644
--- a/pkgs/misc/drivers/foomatic-filters/default.nix
+++ b/pkgs/misc/drivers/foomatic-filters/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchpatch, fetchurl, pkg-config, perl, cups, dbus, enscript }:
 
 stdenv.mkDerivation rec {
-  name = "foomatic-filters-4.0.17";
+  pname = "foomatic-filters";
+  version = "4.0.17";
 
   src = fetchurl {
-    url = "https://www.openprinting.org/download/foomatic/${name}.tar.gz";
+    url = "https://www.openprinting.org/download/foomatic/foomatic-filters-${version}.tar.gz";
     sha256 = "1qrkgbm5jay2r7sh9qbyf0aiyrsl1mdc844hxf7fhw95a0zfbqm2";
   };
 
diff --git a/pkgs/misc/drivers/gutenprint/default.nix b/pkgs/misc/drivers/gutenprint/default.nix
index 9cd76c11ccea..6b1bfefd7014 100644
--- a/pkgs/misc/drivers/gutenprint/default.nix
+++ b/pkgs/misc/drivers/gutenprint/default.nix
@@ -6,10 +6,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "gutenprint-5.3.4";
+  pname = "gutenprint";
+  version = "5.3.4";
 
   src = fetchurl {
-    url = "mirror://sourceforge/gimp-print/${name}.tar.bz2";
+    url = "mirror://sourceforge/gimp-print/gutenprint-${version}.tar.bz2";
     sha256 = "0s0b14hjwvbxksq7af5v8z9g2rfqv9jdmxd9d81m57f5mh6rad0p";
   };
 
diff --git a/pkgs/misc/drivers/m33-linux/default.nix b/pkgs/misc/drivers/m33-linux/default.nix
index d2ba2685a291..84272898f52c 100644
--- a/pkgs/misc/drivers/m33-linux/default.nix
+++ b/pkgs/misc/drivers/m33-linux/default.nix
@@ -1,7 +1,8 @@
 { lib, stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation {
-  name = "M33-Linux-2016-06-23";
+  pname = "M33-Linux";
+  version = "unstable-2016-06-23";
 
   src = fetchFromGitHub {
     owner = "donovan6000";
diff --git a/pkgs/misc/drivers/xwiimote/default.nix b/pkgs/misc/drivers/xwiimote/default.nix
index 8fafd1b6ebcc..414a207fa544 100644
--- a/pkgs/misc/drivers/xwiimote/default.nix
+++ b/pkgs/misc/drivers/xwiimote/default.nix
@@ -1,9 +1,11 @@
 { lib, stdenv, udev, ncurses, pkg-config, fetchurl, bluez }:
 
 stdenv.mkDerivation rec {
-  name = "xwiimote-2";
+  pname = "xwiimote";
+  version = "2";
+
   src = fetchurl {
-    url = "https://github.com/dvdhrm/xwiimote/releases/download/${name}/${name}.tar.xz";
+    url = "https://github.com/dvdhrm/xwiimote/releases/download/xwiimote-${version}/xwiimote-${version}.tar.xz";
     sha256 = "1g9cbhblll47l300zr999xr51x2g98y49l222f77fhswd12kjzhd";
   };