Merge pull request #133674 from Stunkymonkey/misc-pname-version

misc: replace name with pname&version

4 files changed, 14 insertions, 10 deletions

diff --git a/pkgs/misc/cups/drivers/brgenml1cupswrapper/default.nix b/pkgs/misc/cups/drivers/brgenml1cupswrapper/default.nix
index ec02e8c4f0e..e309e8e8b26 100644
--- a/pkgs/misc/cups/drivers/brgenml1cupswrapper/default.nix
+++ b/pkgs/misc/cups/drivers/brgenml1cupswrapper/default.nix
@@ -52,10 +52,11 @@
 */
 
 stdenv.mkDerivation rec {
+  pname = "brgenml1cupswrapper";
+  version = "3.1.0-1";
 
-  name = "brgenml1cupswrapper-3.1.0-1";
   src = fetchurl {
-    url = "https://download.brother.com/welcome/dlf101125/${name}.i386.deb";
+    url = "https://download.brother.com/welcome/dlf101125/brgenml1cupswrapper-${version}.i386.deb";
     sha256 = "0kd2a2waqr10kfv1s8is3nd5dlphw4d1343srdsbrlbbndja3s6r";
   };
 
diff --git a/pkgs/misc/cups/drivers/brgenml1lpr/default.nix b/pkgs/misc/cups/drivers/brgenml1lpr/default.nix
index 6cdff2c4124..fd439e9cd73 100644
--- a/pkgs/misc/cups/drivers/brgenml1lpr/default.nix
+++ b/pkgs/misc/cups/drivers/brgenml1lpr/default.nix
@@ -35,10 +35,11 @@ let
   '';
 in
 stdenv.mkDerivation rec {
+  pname = "brgenml1lpr";
+  version = "3.1.0-1";
 
-  name = "brgenml1lpr-3.1.0-1";
   src = fetchurl {
-    url = "https://download.brother.com/welcome/dlf101123/${name}.i386.deb";
+    url = "https://download.brother.com/welcome/dlf101123/brgenml1lpr-${version}.i386.deb";
     sha256 = "0zdvjnrjrz9sba0k525linxp55lr4cyivfhqbkq1c11br2nvy09f";
   };
 
diff --git a/pkgs/misc/cups/drivers/cups-bjnp/default.nix b/pkgs/misc/cups/drivers/cups-bjnp/default.nix
index 40243bb9196..5a6ea08a8e1 100644
--- a/pkgs/misc/cups/drivers/cups-bjnp/default.nix
+++ b/pkgs/misc/cups/drivers/cups-bjnp/default.nix
@@ -1,10 +1,11 @@
 {lib, stdenv, fetchurl, cups}:
 
 stdenv.mkDerivation rec {
-  name = "cups-bjnp-1.2.2";
+  pname = "cups-bjnp";
+  version = "1.2.2";
 
   src = fetchurl {
-    url = "mirror://sourceforge/cups-bjnp/${name}.tar.gz";
+    url = "mirror://sourceforge/cups-bjnp/cups-bjnp-${version}.tar.gz";
     sha256 = "0sb0vm1sf8ismzd9ba33qswxmsirj2z1b7lnyrc9v5ixm7q0bnrm";
   };
 
diff --git a/pkgs/misc/cups/drivers/splix/default.nix b/pkgs/misc/cups/drivers/splix/default.nix
index eae42124063..cfe53e48d67 100644
--- a/pkgs/misc/cups/drivers/splix/default.nix
+++ b/pkgs/misc/cups/drivers/splix/default.nix
@@ -3,7 +3,8 @@
 let
 
   color-profiles = stdenv.mkDerivation {
-    name = "splix-color-profiles-20070625";
+    pname = "splix-color-profiles";
+    version = "unstable-2007-06-25";
 
     src = fetchurl {
       url = "http://splix.ap2c.org/samsung_cms.tar.bz2";
@@ -17,14 +18,14 @@ let
   };
 
 in stdenv.mkDerivation rec {
-  name = "splix-svn-${rev}";
-  rev = "315";
+  pname = "splix-svn";
+  version = "315";
 
   src = fetchsvn {
     # We build this from svn, because splix hasn't been in released in several years
     # although the community has been adding some new printer models.
     url = "svn://svn.code.sf.net/p/splix/code/splix";
-    inherit rev;
+    rev = version;
     sha256 = "16wbm4xnz35ca3mw2iggf5f4jaxpyna718ia190ka6y4ah932jxl";
   };