From 07e6d98fd541d6af3e7a447d23c20ce31da9cad5 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Sun, 10 Feb 2008 17:41:04 +0000
Subject: [PATCH] Fixed selectVersion syntax (introduced by trunk merge)

svn path=/nixpkgs/branches/stdenv-updates/; revision=10603
---
 pkgs/top-level/all-packages.nix | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2329c49b238..2f540339ffc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -944,9 +944,8 @@ rec {
     inherit fetchurl stdenv ncurses;
   };
 
-  zshFun = lib.sumArgs (selectVersion ../shells/zsh) {
+  zshFun = lib.sumArgs (selectVersion ../shells/zsh "4.3.5") {
     inherit fetchurl stdenv ncurses coreutils;
-    version = "4.3.5";
   };
 
   zsh = zshFun null;
@@ -2665,9 +2664,8 @@ rec {
 	qt = qt4;
   };
 
-  tkFun = lib.sumArgs (selectVersion ../development/libraries/tk) {
+  tkFun = lib.sumArgs (selectVersion ../development/libraries/tk "8.4.16") {
     inherit fetchurl stdenv tcl x11;
-    version = "8.4.16";
   };
 
   tk = tkFun null;
@@ -3868,10 +3866,9 @@ rec {
     inherit fetchurl stdenv cabextract;
   };
 
-  xkeyboard_configFun = lib.sumArgs (selectVersion ../data/misc/xkeyboard-config ) {
+  xkeyboard_configFun = lib.sumArgs (selectVersion ../data/misc/xkeyboard-config "1.2") {
     inherit fetchurl stdenv perl perlXMLParser gettext;
     inherit (xlibs) xkbcomp;
-    version = "1.2";
   };
 
   xkeyboard_config = xkeyboard_configFun null;