public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed selectVersion syntax (introduced by trunk merge) 

svn path=/nixpkgs/branches/stdenv-updates/; revision=10603
This commit is contained in:
Yury G. Kudryashov 2008-02-10 17:41:04 +00:00
parent eddff7a74a
commit 07e6d98fd5
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/top-level/all-packages.nix
View File

@ -944,9 +944,8 @@ rec {
inherit fetchurl stdenv ncurses; inherit fetchurl stdenv ncurses;
}; };
zshFun = lib.sumArgs (selectVersion ../shells/zsh) { zshFun = lib.sumArgs (selectVersion ../shells/zsh "4.3.5") {
inherit fetchurl stdenv ncurses coreutils; inherit fetchurl stdenv ncurses coreutils;
version = "4.3.5";
}; };
zsh = zshFun null; zsh = zshFun null;
@ -2665,9 +2664,8 @@ rec {
qt = qt4; qt = qt4;
}; };
tkFun = lib.sumArgs (selectVersion ../development/libraries/tk) { tkFun = lib.sumArgs (selectVersion ../development/libraries/tk "8.4.16") {
inherit fetchurl stdenv tcl x11; inherit fetchurl stdenv tcl x11;
version = "8.4.16";
}; };
tk = tkFun null; tk = tkFun null;
@ -3868,10 +3866,9 @@ rec {
inherit fetchurl stdenv cabextract; 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 fetchurl stdenv perl perlXMLParser gettext;
inherit (xlibs) xkbcomp; inherit (xlibs) xkbcomp;
version = "1.2";
}; };
xkeyboard_config = xkeyboard_configFun null; xkeyboard_config = xkeyboard_configFun null;