treewide: rename name to pname&version

4 files changed, 20 insertions, 16 deletions

diff --git a/pkgs/tools/typesetting/pdftk/legacy.nix b/pkgs/tools/typesetting/pdftk/legacy.nix
index 3c4d042097ff..189978870376 100644
--- a/pkgs/tools/typesetting/pdftk/legacy.nix
+++ b/pkgs/tools/typesetting/pdftk/legacy.nix
@@ -1,10 +1,11 @@
 { fetchurl, lib, stdenv, gcj, unzip }:
 
-stdenv.mkDerivation {
-  name = "pdftk-2.02";
+stdenv.mkDerivation rec {
+  pname = "pdftk";
+  version = "2.02";
 
   src = fetchurl {
-    url = "https://www.pdflabs.com/tools/pdftk-the-pdf-toolkit/pdftk-2.02-src.zip";
+    url = "https://www.pdflabs.com/tools/pdftk-the-pdf-toolkit/pdftk-${version}-src.zip";
     sha256 = "1hdq6zm2dx2f9h7bjrp6a1hfa1ywgkwydp14i2sszjiszljnm3qi";
   };
 
@@ -36,7 +37,7 @@ stdenv.mkDerivation {
     description = "Simple tool for doing everyday things with PDF documents";
     homepage = "https://www.pdflabs.com/tools/pdftk-server/";
     license = lib.licenses.gpl2;
-    maintainers = with lib.maintainers; [raskin];
+    maintainers = with lib.maintainers; [ raskin ];
     platforms = with lib.platforms; linux;
     broken = true; # Broken on Hydra since 2020-08-24
   };
diff --git a/pkgs/tools/typesetting/tex/pgf/1.x.nix b/pkgs/tools/typesetting/tex/pgf/1.x.nix
index efaf0e0fe1b3..618f936d8bf8 100644
--- a/pkgs/tools/typesetting/tex/pgf/1.x.nix
+++ b/pkgs/tools/typesetting/tex/pgf/1.x.nix
@@ -1,10 +1,11 @@
-{lib, stdenv, fetchurl}:
+{ lib, stdenv, fetchurl }:
 
-stdenv.mkDerivation {
-  name = "pgf-1.18";
+stdenv.mkDerivation rec {
+  pname = "pgf";
+  version = "1.18";
 
   src = fetchurl {
-    url = "mirror://sourceforge/pgf/pgf-1.18.tar.gz";
+    url = "mirror://sourceforge/pgf/pgf-${version}.tar.gz";
     sha256 = "0s6b8rx9yfxcjjg18vx1mphnwbd28fl5lnq0dasjz40pp3ypwdjv";
   };
 
diff --git a/pkgs/tools/typesetting/tex/pgf/2.x.nix b/pkgs/tools/typesetting/tex/pgf/2.x.nix
index 9661ec3324be..b8a3f2f63660 100644
--- a/pkgs/tools/typesetting/tex/pgf/2.x.nix
+++ b/pkgs/tools/typesetting/tex/pgf/2.x.nix
@@ -1,10 +1,11 @@
-{lib, stdenv, fetchurl}:
+{ lib, stdenv, fetchurl }:
 
-stdenv.mkDerivation {
-  name = "pgf-2.00";
+stdenv.mkDerivation rec {
+  pname = "pgf";
+  version = "2.00";
 
   src = fetchurl {
-    url = "mirror://sourceforge/pgf/pgf-2.00.tar.gz";
+    url = "mirror://sourceforge/pgf/pgf-${version}.tar.gz";
     sha256 = "0j57niag4jb2k0iyrvjsannxljc3vkx0iag7zd35ilhiy4dh6264";
   };
 
diff --git a/pkgs/tools/typesetting/tex/pgf/3.x.nix b/pkgs/tools/typesetting/tex/pgf/3.x.nix
index b33f05d34a78..9af41ff1f43f 100644
--- a/pkgs/tools/typesetting/tex/pgf/3.x.nix
+++ b/pkgs/tools/typesetting/tex/pgf/3.x.nix
@@ -1,10 +1,11 @@
-{lib, stdenv, fetchurl, unzip}:
+{ lib, stdenv, fetchurl, unzip }:
 
-stdenv.mkDerivation {
-  name = "pgf-3.00";
+stdenv.mkDerivation rec {
+  pname = "pgf";
+  version = "3.0.0";
 
   src = fetchurl {
-    url = "mirror://sourceforge/project/pgf/pgf/version%203.0.0/pgf_3.0.0.tds.zip";
+    url = "mirror://sourceforge/project/pgf/pgf/version%20${version}/pgf_${version}.tds.zip";
     sha256 = "0kj769hyp4z2zmdv3f8xv443wcfqn5nkkbzxzqgfxjizlz81aav7";
   };