summary refs log tree commit diff
path: root/pkgs/top-level/all-packages.nix
diff options
context:
space:
mode:
authorYury G. Kudryashov <urkud.urkud@gmail.com>2008-02-10 17:41:04 +0000
committerYury G. Kudryashov <urkud.urkud@gmail.com>2008-02-10 17:41:04 +0000
commit07e6d98fd541d6af3e7a447d23c20ce31da9cad5 (patch)
tree17e04be1d531eca76f03045836f590d2d60ee081 /pkgs/top-level/all-packages.nix
parenteddff7a74a99da2a46f7f5d6210c2db6d3c3f9e2 (diff)
downloadnixpkgs-07e6d98fd541d6af3e7a447d23c20ce31da9cad5.tar
nixpkgs-07e6d98fd541d6af3e7a447d23c20ce31da9cad5.tar.gz
nixpkgs-07e6d98fd541d6af3e7a447d23c20ce31da9cad5.tar.bz2
nixpkgs-07e6d98fd541d6af3e7a447d23c20ce31da9cad5.tar.lz
nixpkgs-07e6d98fd541d6af3e7a447d23c20ce31da9cad5.tar.xz
nixpkgs-07e6d98fd541d6af3e7a447d23c20ce31da9cad5.tar.zst
nixpkgs-07e6d98fd541d6af3e7a447d23c20ce31da9cad5.zip
Fixed selectVersion syntax (introduced by trunk merge)
svn path=/nixpkgs/branches/stdenv-updates/; revision=10603
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
-rw-r--r--pkgs/top-level/all-packages.nix9
1 files 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;