1 files changed, 21 insertions, 6 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0e8d59ebfca..c7680244b5c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -442,10 +442,6 @@ let
     inherit fetchurl stdenv;
   };
 
-  ncompress = import ../tools/compression/ncompress {
-    inherit fetchurl stdenv;
-  };
-
   bzip2 = useFromStdenv "bzip2"
     (import ../tools/compression/bzip2 {
       inherit fetchurl stdenv;
@@ -1129,6 +1125,10 @@ let
     inherit fetchurl stdenv ncurses coreutils;
   };
 
+  ncompress = import ../tools/compression/ncompress {
+    inherit fetchurl stdenv;
+  };
+
   netcat = import ../tools/networking/netcat {
     inherit fetchurl stdenv;
   };
@@ -1137,11 +1137,9 @@ let
     inherit fetchurl stdenv;
   };
 
-  /*
   netpbm = import ../tools/graphics/netpbm {
     inherit stdenv fetchsvn libjpeg libpng zlib flex perl libxml2 makeWrapper;
   };
-  */
 
   netselect = import ../tools/networking/netselect {
     inherit fetchurl stdenv;
@@ -3239,6 +3237,10 @@ let
     inherit (xlibs) libX11 xf86vidmodeproto libXmu libXxf86vm;
   };
 
+  classads = import ../development/libraries/classads {
+    inherit fetchurl stdenv;
+  };
+
   classpath = import ../development/libraries/java/classpath {
     javac = gcj;
     jvm = gcj;
@@ -3633,6 +3635,10 @@ let
     inherit fetchurl stdenv;
   };
 
+  gsoap = import ../development/libraries/gsoap {
+    inherit fetchurl stdenv m4 bison flex openssl zlib;
+  };
+
   gtkimageview = import ../development/libraries/gtkimageview {
     inherit fetchurl stdenv pkgconfig;
     inherit (gnome) gtk;
@@ -4216,6 +4222,10 @@ let
     inherit fetchurl stdenv;
   };
 
+  libvirt = import ../development/libraries/libvirt {
+    inherit stdenv fetchurl libxml2 gnutls devicemapper perl;
+  };
+
   libvncserver = builderDefsPackage (import ../development/libraries/libvncserver) {
     inherit libtool libjpeg openssl zlib;
     inherit (xlibs) xproto libX11 damageproto libXdamage
@@ -8647,6 +8657,11 @@ let
     inherit stdenv fetchsvn apacheAnt jdk axis2 shebangfix;
   };
 
+  latex2html = import ../misc/tex/latex2html/default.nix {
+    inherit fetchurl stdenv perl ghostscript netpbm;
+    tex = tetex;
+  };
+
   pgadmin = import ../applications/misc/pgadmin {
     inherit fetchurl stdenv postgresql libxml2 libxslt openssl;
     inherit wxGTK;