Added nc6, updated xkeyboard-config

svn path=/nixpkgs/trunk/; revision=10469

1 files changed, 19 insertions, 2 deletions

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 80ea99e1cd3..99f714a873c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -638,6 +638,13 @@ rec {
     inherit fetchurl stdenv gettext;
   };
 
+  nc6Fun = lib.sumArgs (selectVersion ../tools/networking/nc6) {
+    version = "1.0";
+    inherit builderDefs;
+  };
+
+  nc6 = nc6Fun null;
+
   ncat = import ../tools/networking/ncat {
     inherit fetchurl stdenv openssl;
   };
@@ -4005,11 +4012,14 @@ rec {
     inherit fetchurl stdenv cabextract;
   };
 
-  xkeyboard_config = import ../data/misc/xkeyboard-config {
-    inherit fetchurl stdenv perl perlXMLParser;
+  xkeyboard_configFun = lib.sumArgs (selectVersion ../data/misc/xkeyboard-config ) {
+    inherit fetchurl stdenv perl perlXMLParser gettext;
     inherit (xlibs) xkbcomp;
+    version = "1.2";
   };
 
+  xkeyboard_config = xkeyboard_configFun null;
+
 
   ### APPLICATIONS
 
@@ -5393,6 +5403,13 @@ rec {
     inherit fetchurl stdenv flex bison zlib libpng ncurses ed;
   };
 
+  /*tetexX11 = import ../misc/tex/tetex {
+    inherit fetchurl stdenv flex bison zlib libpng ncurses ed;
+    inherit (xlibs) libX11 libXext libXmu libXaw libXt libXpm;
+    inherit freetype t1lib;
+    builderX11 = true;
+  };*/
+
   texFunctions = import ../misc/tex/nix {
     inherit stdenv perl tetex graphviz ghostscript;
   };