From 19e0cda8d8890fb251e3a0a3e29e6ace9b5058d1 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom.stdin@gmail.com>
Date: Tue, 26 Oct 2010 00:22:44 +0000
Subject: [PATCH] Fix names of packages. Patch by Karn Kallio.

svn path=/nixpkgs/trunk/; revision=24478
---
 pkgs/applications/misc/mysql-workbench/default.nix | 3 ++-
 pkgs/development/compilers/urweb/default.nix       | 6 +++---
 pkgs/development/interpreters/racket/default.nix   | 6 +++---
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/misc/mysql-workbench/default.nix b/pkgs/applications/misc/mysql-workbench/default.nix
index 0f3b3f2bb5fd..0b6d70b5b00d 100644
--- a/pkgs/applications/misc/mysql-workbench/default.nix
+++ b/pkgs/applications/misc/mysql-workbench/default.nix
@@ -5,8 +5,9 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "mysql-workbench";
+  pname = "mysql-workbench";
   version = "5.2.27";
+  name = "${pname}-${version}";
 
   src = fetchurl {
     url = "http://mirror.services.wisc.edu/mysql/Downloads/MySQLGUITools/mysql-workbench-gpl-${version}.tar.gz";
diff --git a/pkgs/development/compilers/urweb/default.nix b/pkgs/development/compilers/urweb/default.nix
index 449e5ccdb477..4a9b6acc1545 100644
--- a/pkgs/development/compilers/urweb/default.nix
+++ b/pkgs/development/compilers/urweb/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, file, libmhash, mlton, mysql, postgresql, sqlite }:
 
 stdenv.mkDerivation rec {
-  name = "urweb";
+  pname = "urweb";
   version = "20100603";
-  pname = "${name}-${version}";
+  name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "http://www.impredicative.com/ur/${pname}.tgz";
+    url = "http://www.impredicative.com/ur/${name}.tgz";
     sha256 = "1f2l09g3586w0fyd7i7wkfnqlqwrk7c1q9pngmd8jz69g5ysl808";
   };
 
diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix
index f9b6c5ab2410..6642ef501cf4 100644
--- a/pkgs/development/interpreters/racket/default.nix
+++ b/pkgs/development/interpreters/racket/default.nix
@@ -3,12 +3,12 @@
 , libXt, libXmu, mesa, pkgconfig, which } :
 
 stdenv.mkDerivation rec {
-  name = "racket";
+  pname = "racket";
   version = "5.0.1";
-  pname = "${name}-${version}";
+  name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "http://download.racket-lang.org/installers/${version}/${name}/${pname}-src-unix.tgz";
+    url = "http://download.racket-lang.org/installers/${version}/${pname}/${name}-src-unix.tgz";
     sha256 = "18bzzzbxvr888lnpwggismq5grysrwlyg2dp026hhv5n2mk5sfvn";
   };