From ef25944cdb714e5ef3afcfafe4672766816298f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sun, 3 May 2009 14:35:56 +0000
Subject: [PATCH] Updating tcl/tk

svn path=/nixpkgs/trunk/; revision=15434
---
 pkgs/development/interpreters/tcl/default.nix    | 8 ++++----
 pkgs/development/tools/analysis/spin/default.nix | 2 +-
 pkgs/top-level/all-packages.nix                  | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/interpreters/tcl/default.nix b/pkgs/development/interpreters/tcl/default.nix
index 7cc58b92145c..c9aa16ce28d4 100644
--- a/pkgs/development/interpreters/tcl/default.nix
+++ b/pkgs/development/interpreters/tcl/default.nix
@@ -1,18 +1,18 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation {
-  name = "tcl-8.4.18";
+  name = "tcl-8.5.7";
 
   src = fetchurl {
-    url = mirror://sourceforge/tcl/tcl8.4.18-src.tar.gz;
-    sha256 = "197h3m2lc5a6famc683zhjp55774gf8zwggfy2893v48lp5p7qny";
+    url = mirror://sourceforge/tcl/tcl8.5.7-src.tar.gz;
+    sha256 = "1wk67qq12bdbaqsi6cxwj6ra8nc8ph1na9rh808kfk6hm18qvlk7";
   };
 
   preConfigure = "cd unix";
 
   postInstall = ''
     make install-private-headers
-    ln -s $out/bin/tclsh8.4 $out/bin/tclsh
+    ln -s $out/bin/tclsh8.5 $out/bin/tclsh
   '';
   
   meta = {
diff --git a/pkgs/development/tools/analysis/spin/default.nix b/pkgs/development/tools/analysis/spin/default.nix
index 6bfc6fe7de02..f2a48cc09339 100644
--- a/pkgs/development/tools/analysis/spin/default.nix
+++ b/pkgs/development/tools/analysis/spin/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
   installPhase = ''
     ensureDir $out/bin
     cp ../Xspin*/xsp* $out/bin/xspin
-    sed -i -e '1s@^#!/bin/sh@#!${tk}/bin/wish8.4@' \
+    sed -i -e '1s@^#!/bin/sh@#!${tk}/bin/wish@' \
       -e '/exec wish/d' $out/bin/xspin
     cp spin $out/bin
   '';
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index dd02204b087a..cfae49a5bec1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3939,7 +3939,7 @@ let
     inherit stdenv fetchurl cmake qt4;
   };
 
-  tk = composedArgsAndFun (selectVersion ../development/libraries/tk "8.4.18") {
+  tk = composedArgsAndFun (selectVersion ../development/libraries/tk "8.5.7") {
     inherit fetchurl stdenv tcl x11;
   };