tools: replace name with pname&version

5 files changed, 15 insertions, 10 deletions

diff --git a/pkgs/tools/bluetooth/obex-data-server/default.nix b/pkgs/tools/bluetooth/obex-data-server/default.nix
index f580080e8796..cc6754b4a8c0 100644
--- a/pkgs/tools/bluetooth/obex-data-server/default.nix
+++ b/pkgs/tools/bluetooth/obex-data-server/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, pkg-config, libusb-compat-0_1, glib, dbus-glib, bluez, openobex, dbus }:
 
 stdenv.mkDerivation rec {
-  name = "obex-data-server-0.4.6";
+  pname = "obex-data-server";
+  version = "0.4.6";
 
   src = fetchurl {
-    url = "http://tadas.dailyda.com/software/${name}.tar.gz";
+    url = "http://tadas.dailyda.com/software/obex-data-server-${version}.tar.gz";
     sha256 = "0kq940wqs9j8qjnl58d6l3zhx0jaszci356xprx23l6nvdfld6dk";
   };
 
diff --git a/pkgs/tools/bluetooth/obexd/default.nix b/pkgs/tools/bluetooth/obexd/default.nix
index 6ddbcd5652de..c18aa3a1c263 100644
--- a/pkgs/tools/bluetooth/obexd/default.nix
+++ b/pkgs/tools/bluetooth/obexd/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, pkg-config, glib, dbus, openobex, bluez, libical }:
 
 stdenv.mkDerivation rec {
-  name = "obexd-0.48";
+  pname = "obexd";
+  version = "0.48";
 
   src = fetchurl {
-    url = "mirror://kernel/linux/bluetooth/${name}.tar.bz2";
+    url = "mirror://kernel/linux/bluetooth/obexd-${version}.tar.bz2";
     sha256 = "1i20dnibvnq9lnkkhajr5xx3kxlwf9q5c4jm19kyb0q1klzgzlb8";
   };
 
diff --git a/pkgs/tools/bluetooth/obexfs/default.nix b/pkgs/tools/bluetooth/obexfs/default.nix
index b81e8c4ea55b..2783c63899df 100644
--- a/pkgs/tools/bluetooth/obexfs/default.nix
+++ b/pkgs/tools/bluetooth/obexfs/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, pkg-config, bluez, fuse, obexftp }:
 
 stdenv.mkDerivation rec {
-  name = "obexfs-0.12";
+  pname = "obexfs";
+  version = "0.12";
 
   src = fetchurl {
-    url = "mirror://sourceforge/openobex/${name}.tar.gz";
+    url = "mirror://sourceforge/openobex/obexfs-${version}.tar.gz";
     sha256 = "1g3krpygk6swa47vbmp9j9s8ahqqcl9ra8r25ybgzv2d9pmjm9kj";
   };
 
diff --git a/pkgs/tools/bluetooth/obexftp/default.nix b/pkgs/tools/bluetooth/obexftp/default.nix
index fc2ff6128f75..3d9eda383ddf 100644
--- a/pkgs/tools/bluetooth/obexftp/default.nix
+++ b/pkgs/tools/bluetooth/obexftp/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, pkg-config, openobex, bluez, cmake }:
 
 stdenv.mkDerivation rec {
-  name = "obexftp-0.24.2";
+  pname = "obexftp";
+  version = "0.24.2";
 
   src = fetchurl {
-    url = "mirror://sourceforge/openobex/${name}-Source.tar.gz";
+    url = "mirror://sourceforge/openobex/obexftp-${version}-Source.tar.gz";
     sha256 = "18w9r78z78ri5qc8fjym4nk1jfbrkyr789sq7rxrkshf1a7b83yl";
   };
 
diff --git a/pkgs/tools/bluetooth/openobex/default.nix b/pkgs/tools/bluetooth/openobex/default.nix
index 1079623cf2af..831644bd4ac0 100644
--- a/pkgs/tools/bluetooth/openobex/default.nix
+++ b/pkgs/tools/bluetooth/openobex/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, pkg-config, bluez, libusb-compat-0_1, cmake }:
 
 stdenv.mkDerivation rec {
-  name = "openobex-1.7.2";
+  pname = "openobex";
+  version = "1.7.2";
 
   src = fetchurl {
-    url = "mirror://sourceforge/openobex/${name}-Source.tar.gz";
+    url = "mirror://sourceforge/openobex/openobex-${version}-Source.tar.gz";
     sha256 = "1z6l7pbwgs5pjx3861cyd3r6vq5av984bdp4r3hgrw2jxam6120m";
   };