3 files changed, 25 insertions, 1 deletions
diff --git a/pkgs/misc/jackaudio/default.nix b/pkgs/misc/jackaudio/default.nix
index f16b2fd8f1ef..578786aac805 100644
--- a/pkgs/misc/jackaudio/default.nix
+++ b/pkgs/misc/jackaudio/default.nix
@@ -1,7 +1,7 @@
 # Perhaps we can get some ideas from here ? http://gentoo-wiki.com/HOWTO_Jack 
 # still much to test but it compiles now
 args:
-args.mkDerivationByConfigruation {
+args.mkDerivationByConfiguration {
     flagConfig = {
     mandatory = { buildInputs = [ ];};
 
diff --git a/pkgs/tools/networking/telnet/default.nix b/pkgs/tools/networking/telnet/default.nix
new file mode 100644
index 000000000000..ba00bb6b5987
--- /dev/null
+++ b/pkgs/tools/networking/telnet/default.nix
@@ -0,0 +1,18 @@
+{stdenv, fetchurl, ncurses}:
+
+stdenv.mkDerivation {
+  name = "telnet-1.2";
+
+  src = fetchurl {
+    url = ftp://ftp.suse.com/pub/people/kukuk/ipv6/telnet-bsd-1.2.tar.bz2;
+    sha256 = "0cs7ks22dhcn5qfjv2vl6ikhw93x68gg33zdn5f5cxgg81kx5afn";
+  };
+
+  buildInputs = [ncurses];
+
+  meta = {
+    description = "A client and daemon for the Telnet protocol";
+    homepage = ftp://ftp.suse.com/pub/people/kukuk/ipv6/;
+    license = "BSD";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ad27dbf8689a..858bb438fa35 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -674,6 +674,10 @@ rec {
     inherit fetchurl stdenv libpcap;
   };
 
+  telnet = import ../tools/networking/telnet {
+    inherit fetchurl stdenv ncurses;
+  };
+
   testdisk = import ../tools/misc/testdisk {
     inherit fetchurl stdenv ncurses libjpeg e2fsprogs zlib openssl;
   };
@@ -4170,11 +4174,13 @@ rec {
   #};
 
   # using the new configuration style proposal which is unstable
+  /*
   jackaudio = import ../misc/jackaudio {
    inherit mkDerivationByConfiguration 
            ncurses lib stdenv fetchurl;
    flags = [ "posix_shm" "timestamps"];
   };
+  */
  
   keynav = import ../tools/X11/keynav {
 	inherit stdenv fetchurl;