* Sync with trunk.

svn path=/nixpkgs/branches/x-updates/; revision=26243

pkgs/development/compilers/ghc/7.0.2.nix

@@ -0,0 +1,45 @@
+{stdenv, fetchurl, ghc, perl, gmp, ncurses}:
+
+stdenv.mkDerivation rec {
+  version = "7.0.2";
+  
+  name = "ghc-${version}";
+  
+  # TODO: Does this have to be here, or can it go to meta?
+  homepage = "http://haskell.org/ghc";
+
+  src = fetchurl {
+    url = "http://haskell.org/ghc/dist/${version}/${name}-src.tar.bz2";
+    sha256 = "f0551f1af2f008a8a14a888b70c0557e00dd04f9ae309ac91897306cd04a6668";
+  };
+
+  buildInputs = [ghc perl gmp ncurses];
+
+  buildMK = ''
+    libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp}/lib"
+    libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp}/include"
+  '';
+
+  preConfigure = ''
+    echo "${buildMK}" > mk/build.mk
+  '';
+
+  configureFlags=[
+    "--with-gcc=${stdenv.gcc}/bin/gcc"
+  ];
+
+  # required, because otherwise all symbols from HSffi.o are stripped, and
+  # that in turn causes GHCi to abort
+  stripDebugFlags=["-S" "--keep-file-symbols"];
+
+  meta = {
+    inherit homepage;
+    description = "The Glasgow Haskell Compiler";
+    maintainers = [
+      stdenv.lib.maintainers.marcweber
+      stdenv.lib.maintainers.andres
+    ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+
+}

pkgs/development/libraries/cminpack/default.nix

@@ -0,0 +1,25 @@
+{stdenv, fetchurl}:
+
+stdenv.mkDerivation {
+  name = "cminpack-1.1.2";
+  
+  src = fetchurl {
+    url = http://devernay.free.fr/hacks/cminpack/cminpack-1.1.2.tar.gz;
+    sha256 = "0sd8gqk7npyiiiz2jym8q89d9gqx8fig0mnx63swkwmp4lqmmxww";
+  };
+
+  patchPhase = ''
+    sed -i s,/usr/local,$out, Makefile
+  '';
+
+  preInstall = ''
+    ensureDir $out/lib $out/include
+  '';
+
+  meta = {
+    homepage = http://devernay.free.fr/hacks/cminpack/cminpack.html;
+    license = "BSD";
+    description = "Software for solving nonlinear equations and nonlinear least squares problems";
+  };
+
+}

pkgs/development/libraries/flann/default.nix

@@ -0,0 +1,18 @@
+{stdenv, fetchurl, unzip, cmake, python}:
+
+stdenv.mkDerivation {
+  name = "flann-1.6.8";
+  
+  src = fetchurl {
+    url = http://people.cs.ubc.ca/~mariusm/uploads/FLANN/flann-1.6.8-src.zip;
+    sha256 = "0ag9k821jy0983gjrfsjnqkl5axklcih0qkpfy72h3643nin0f50";
+  };
+
+  buildInputs = [ unzip cmake python ];
+
+  meta = {
+    homepage = http://people.cs.ubc.ca/~mariusm/flann/;
+    license = "BSD";
+    description = "Fast approximate nearest neighbor searches in high dimensional spaces";
+  };
+}

pkgs/development/libraries/gmime/2.2.x.nix

@@ -1,17 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, glib, zlib }:
-
-stdenv.mkDerivation rec {
-  name = "gmime-2.2.26";
-  
-  src = fetchurl {
-    url = "mirror://gnome/sources/gmime/2.2/${name}.tar.gz";
-    sha256 = "16inhq6symym9n71kxcndjwrxs2xrz63idvy64yc486wlg54aqfc";
-  };
-  
-  buildInputs = [ pkgconfig glib zlib ];
-
-  meta = {
-    homepage = http://spruce.sourceforge.net/gmime/;
-    description = "A C/C++ library for manipulating MIME messages";
-  };
-}

pkgs/development/tools/analysis/valgrind/default.nix

@@ -1,11 +1,11 @@
 { stdenv, fetchurl, perl, gdb, autoconf, automake }:
 
 stdenv.mkDerivation rec {
-  name = "valgrind-3.6.0";
+  name = "valgrind-3.6.1";
 
   src = fetchurl {
     url = "http://valgrind.org/downloads/${name}.tar.bz2";
-    sha256 = "0pr8h0q909z15g2i2jrcryhqbshair42rylf3mprhyx4nm9h23xw";
+    sha256 = "03kaf8q49r347diryc2p1q5hxsd6hyhxikqdbydh8q7hpi7wrga9";
   };
 
   # Perl is needed for `cg_annotate'.

pkgs/development/tools/misc/hydra/default.nix

@@ -34,10 +34,10 @@ in
 
 stdenv.mkDerivation rec {
   name = "hydra-${version}";
-  version = "0.1pre25566";
+  version = "0.1pre26202";
   src = fetchurl {
-    url = http://hydra.nixos.org/build/858318/download/1/hydra-0.1pre25566.tar.gz;
-    sha256 = "6b2dc48d609a69dec117debbd185d71bfb092bc7078f8ca59e29aaf3c9591ca7";
+    url = http://hydra.nixos.org/build/956221/download/2/hydra-0.1pre26202.tar.gz;
+    sha256 = "0v727al406akn9n9ys5kl77kagr5l8yq9zi4nnn9nrcii8pavb99";
   };
 
   configureFlags = "--with-nix=${nix}";
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
     rpm dpkg cdrkit]));
 
   postInstall = ''
-    for i in $out/bin/*; do
+    for i in "$out/bin/"*; do
         wrapProgram $i \
             --prefix PERL5LIB ':' $out/libexec/hydra/lib:$PERL5LIB \
             --prefix PATH ':' $out/bin:$hydraPath \
@@ -58,10 +58,12 @@ stdenv.mkDerivation rec {
             --set HYDRA_HOME $out/libexec/hydra \
             --set NIX_RELEASE ${nix.name}
     done
-  ''; # */
+  '';
 
   meta = {
+    description = "Hydra, the Nix-based continuous integration system";
+    homepage = http://nixos.org/hydra/;
+    license = "GPLv3+";
     platforms = stdenv.lib.platforms.linux;
-  };  
+  };
 }
-