3 files changed, 11 insertions, 8 deletions
diff --git a/pkgs/tools/text/xml/xml2/default.nix b/pkgs/tools/text/xml/xml2/default.nix
index 4c312250bf65..265ab10e5ac8 100644
--- a/pkgs/tools/text/xml/xml2/default.nix
+++ b/pkgs/tools/text/xml/xml2/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, pkg-config, libxml2 }:
 
-stdenv.mkDerivation {
-  name = "xml2-0.5";
+stdenv.mkDerivation rec {
+  pname = "xml2";
+  version = "0.5";
 
   src = fetchurl {
-    url = "https://web.archive.org/web/20160427221603/http://download.ofb.net/gale/xml2-0.5.tar.gz";
+    url = "https://web.archive.org/web/20160427221603/http://download.ofb.net/gale/xml2-${version}.tar.gz";
     sha256 = "01cps980m99y99cnmvydihga9zh3pvdsqag2fi1n6k2x7rfkl873";
   };
 
diff --git a/pkgs/tools/text/xml/xmlstarlet/default.nix b/pkgs/tools/text/xml/xmlstarlet/default.nix
index e179c3153e10..39d53088babf 100644
--- a/pkgs/tools/text/xml/xmlstarlet/default.nix
+++ b/pkgs/tools/text/xml/xmlstarlet/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, pkg-config, libxml2, libxslt }:
 
 stdenv.mkDerivation rec {
-  name = "xmlstarlet-1.6.1";
+  pname = "xmlstarlet";
+  version = "1.6.1";
 
   src = fetchurl {
-    url = "mirror://sourceforge/xmlstar/${name}.tar.gz";
+    url = "mirror://sourceforge/xmlstar/xmlstarlet-${version}.tar.gz";
     sha256 = "1jp737nvfcf6wyb54fla868yrr39kcbijijmjpyk4lrpyg23in0m";
   };
 
diff --git a/pkgs/tools/text/xml/xpf/default.nix b/pkgs/tools/text/xml/xpf/default.nix
index 29170394d1e6..ce0813c2ef4a 100644
--- a/pkgs/tools/text/xml/xpf/default.nix
+++ b/pkgs/tools/text/xml/xpf/default.nix
@@ -2,11 +2,12 @@
 
 assert libxml2.pythonSupport == true;
 
-stdenv.mkDerivation {
-  name = "xpf-0.2";
+stdenv.mkDerivation rec {
+  pname = "xpf";
+  version = "0.2";
 
   src = fetchurl {
-    url = "http://tarballs.nixos.org/xpf-0.2.tar.gz";
+    url = "http://tarballs.nixos.org/xpf-${version}.tar.gz";
     sha256 = "0ljx91w68rnh4871c0xlq2whlmhqz8dr39wcdczfjjpniqz1fmpz";
   };