Merging from trunk

svn path=/nixpkgs/branches/stdenv-updates/; revision=24804

pkgs/applications/editors/eclipse/default.nix

@@ -98,6 +98,17 @@ stdenv.mkDerivation rec {
         url = http://mirrors.linux-bg.org/eclipse/eclipse/downloads/drops/R-3.5.1-200909170800/eclipse-SDK-3.5.1-linux-gtk.tar.gz;
         sha256 = "0a0lpa7gxg91zswpahi6fvg3csl4csvlym4z2ad5cc1d4yvicp56";
       }
+    else if v == "3.6.1" then
+     if stdenv.system == "x86_64-linux" then
+       fetchurl {
+        url = http://ftp.ing.umu.se/mirror/eclipse/eclipse/downloads/drops/R-3.6.1-201009090800/eclipse-SDK-3.6.1-linux-gtk-x86_64.tar.gz;
+        sha256 = "1cg9rrb5w978sdqbzz9lnli1lds9zhb6wfsj3wp725bqf1i6v9lg";
+       }
+     else
+       fetchurl {
+        url = http://ftp.ing.umu.se/mirror/eclipse/eclipse/downloads/drops/R-3.6.1-201009090800/eclipse-SDK-3.6.1-linux-gtk.tar.gz;
+        sha256 = "0s48rjaswi8m5gan1zlqvfwb4l06x5nslkq41wpkrbyj9ka8gh4x";
+      }
     else throw "no source for eclipse version ${v} known";
 
   desktopItem = makeDesktopItem {
@@ -131,11 +142,12 @@ stdenv.mkDerivation rec {
     ensureDir $out/share/applications
     cp ${desktopItem}/share/applications/* $out/share/applications
   '';
-
+  
   meta = {
     homepage = http://www.eclipse.org/;
     description = "A extensible multi-language software development environment";
     longDescription = ''
     '';
   };
+  
 }

pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/default.nix

@@ -54,7 +54,7 @@ let
       } else {
         version = "10.1.102.64";
         url = http://fpdownload.macromedia.com/get/flashplayer/current/install_flash_player_10_linux.tar.gz;
-        sha256 = "1bx3cbls40si3l3x6ahncbn8dwrr41gj34hfn51k5ak9ccqn27wg";
+        sha256 = "1jfk9va3id0m6q6csg6gfycmryvi7kylbb7dswpsh6zh1zv00s62";
       }
     else throw "flashplayer is not supported on this platform";
 

pkgs/applications/version-management/fossil/default.nix

@@ -1,7 +1,7 @@
-{stdenv, fetchurl, zlib, openssl}:
+{stdenv, fetchurl, zlib, openssl, tcl}:
 
 let
-  version = "20101101142335";
+  version = "20101117133825";
 in
 
 stdenv.mkDerivation {
@@ -9,10 +9,15 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://www.fossil-scm.org/download/fossil-src-${version}.tar.gz";
-    sha256 = "129a2zf5zpq397nmmmk31k1yhkgvrssgrh9z4aaj6lh50s3ax0bh";
+    sha256 = "0h4g7qsbz5vyd3zxywcc2pf6vf3gavxqznpx8gn47j8y6mjp4byn";
   };
 
-  buildInputs = [ zlib openssl ];
+  buildInputs = [ zlib openssl tcl ];
+  buildNativeInputs = [ zlib openssl ];
+
+  doCheck = true;
+
+  checkTarget = "test";
 
   installPhase = ''
     ensureDir $out/bin
@@ -20,6 +25,7 @@ stdenv.mkDerivation {
   '';
 
   crossAttrs = {
+    doCheck = false;
     makeFlagsArray = [ "TCC=${stdenv.cross.config}-gcc" ];
   };
 
@@ -33,9 +39,11 @@ stdenv.mkDerivation {
       from the others by being extremely simple to setup and operate.
     '';
     homepage = http://www.fossil-scm.org/;
-    license = "GPLv2";
+    license = "BSD";
+    platforms = with stdenv.lib.platforms; all;
     maintainers = [ #Add your name here!
       stdenv.lib.maintainers.z77z
+      stdenv.lib.maintainers.viric
     ];
   };
 }

pkgs/applications/virtualization/qemu/0.13.nix

@@ -1,14 +1,12 @@
 {stdenv, fetchurl, SDL, zlib, which}:
 
 stdenv.mkDerivation rec {
-  name = "qemu-0.12.3";
+  name = "qemu-0.13.0";
 
   src = fetchurl {
     url = "http://download.savannah.gnu.org/releases/qemu/${name}.tar.gz";
-    sha256 = "0jyyz9vm8qrjb6nzfgdwmj9y990fnk2bl9ja0sr1i555n27nzqiw";
+    sha256 = "0xyqbwy78218ja6r9ya5p37j8hcd81l4cpw3ghvnxsjwn18mhvqy";
   };
-
-  patchFlags = "-p2";
   
   buildInputs = [SDL zlib which];
   

pkgs/applications/virtualization/virtualbox/default.nix

@@ -30,6 +30,7 @@ stdenv.mkDerivation {
         -i AutoConfig.kmk
     sed -e 's@arch/x86/@@' \
         -i Config.kmk
+    substituteInPlace Config.kmk --replace "VBOX_WITH_TESTCASES = 1" "#"
     cat >> AutoConfig.kmk << END_PATHS
     VBOX_PATH_APP_PRIVATE := $out
     VBOX_PATH_APP_DOCS := $out/doc

pkgs/development/compilers/ghc/7.0.1.nix

@@ -1,7 +1,7 @@
 {stdenv, fetchurl, ghc, perl, gmp, ncurses}:
 
 stdenv.mkDerivation rec {
-  version = "7.0.1-rc2";
+  version = "7.0.1";
   
   name = "ghc-${version}";
   
@@ -9,8 +9,8 @@ stdenv.mkDerivation rec {
   homepage = "http://haskell.org/ghc";
 
   src = fetchurl {
-    url = "http://new-www.haskell.org/ghc/dist/${version}/ghc-7.0.0.20101028-src.tar.bz2";
-    sha256 = "6048eb94163c96b99094960fe2e5ddd1053594323ba80548dabf50c62c1b7b71";
+    url = "http://new-www.haskell.org/ghc/dist/${version}/${name}-src.tar.bz2";
+    sha256 = "1iciljngxmqy465cw3pkl6jp0ydiils4bfz6ixfaxk7aqv7r7xsi";
   };
 
   buildInputs = [ghc perl gmp ncurses];

pkgs/development/compilers/jdk/default-5.nix

@@ -2,7 +2,7 @@
 
 if stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"
   then
-    (import ./jdk5-sun-linux.nix) {
+    (import ./jdk5-oracle-linux.nix) {
       inherit stdenv fetchurl unzip;
     }
   else

pkgs/development/compilers/jdk/jdk5-oracle-linux.nix

@@ -0,0 +1,26 @@
+/**
+ * This Nix expression requires the user to download the Java 5.0 JDK
+ * distribution to /tmp. Please obtain jdk-1_5_0_22-linux-i586.bin for
+ * 32-bit systems or jdk-1_5_0_22-linux-amd64.bin for 64-bit systems
+ * from java.sun.com (look for archived software downloads) 
+ * by hand and place it in /tmp. Blame Oracle, not me.
+ *
+ * Note that this is not necessary if someone has already pushed a
+ * binary.
+ */
+{stdenv, fetchurl, unzip}: 
+
+assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
+
+let name = "jdk-1_5_0_22"; in
+stdenv.mkDerivation {
+  inherit name;
+  filename = "jdk-1_5_0_22";
+  dirname = "jdk1.5.0_22";
+  builder = ./builder.sh;
+  pathname = if stdenv.system == "x86_64-linux" then "/tmp/${name}-linux-amd64.bin" else "/tmp/${name}-linux-i586.bin";
+  md5 = if stdenv.system == "x86_64-linux" then "b62abcaf9ea8617c50fa213bbc88824a" else "df5dae6d50d2abeafb472dde6d9a17f3";
+  
+  stdenv = stdenv;
+  inherit unzip;
+}

pkgs/development/compilers/jdk/jdk5-sun-linux.nix

@@ -1,24 +0,0 @@
-/**
- * This Nix expression requires the user to download the j2sdk
- * distribution to /tmp. Please obtain jdk-1_5_0_14-linux-i586.bin
- * from java.sun.com by hand and place it in /tmp. Blame Sun, not me.
- *
- * Note that this is not necessary if someone has already pushed a
- * binary.
- */
-{stdenv, fetchurl, unzip}: 
-
-assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
-
-let name = "jdk-1_5_0_19"; in
-stdenv.mkDerivation {
-  inherit name;
-  filename = "jdk-1_5_0_19";
-  dirname = "jdk1.5.0_19";
-  builder = ./builder.sh;
-  pathname = if stdenv.system == "x86_64-linux" then "/tmp/${name}-linux-amd64.bin" else "/tmp/${name}-linux-i586.bin";
-  md5 = if stdenv.system == "x86_64-linux" then "28095941e14669d5025f66260e7b61e7" else "0d082a0c9f5a79b0895b3317c9590ec5";
-  
-  stdenv = stdenv;
-  inherit unzip;
-}

pkgs/development/libraries/haskell/Chart/default.nix

@@ -0,0 +1,15 @@
+{cabal, cairo, colour, dataAccessor, dataAccessorTemplate, gtk, mtl}:
+
+cabal.mkDerivation (self : {
+  pname = "Chart";
+  version = "0.13.1";
+  sha256 = "1gh8qw8xil543wssflhpjrgnig4v79vi7xizrm93a93i4n84npd5";
+  propagatedBuildInputs =
+    [cairo colour dataAccessor dataAccessorTemplate gtk mtl];
+  meta = {
+    description = "A library for generating 2D Charts and Plots";
+    license = "BSD";
+    maintainers = [self.stdenv.lib.maintainers.andres];
+  };
+})  
+

pkgs/development/libraries/haskell/criterion/default.nix

@@ -1,13 +1,17 @@
 {cabal, deepseq, mtl, parallel, parsec, vector, vectorAlgorithms,
- mwcRandom, statistics}:
+ mwcRandom, statistics, Chart, dataAccessor}:
 
 cabal.mkDerivation (self : {
   pname = "criterion";
   version = "0.5.0.5";
   sha256 = "1b1g7a2ip07j0554cj4d0413859fbdkaxpcgq2znjz7wh8z5aabn";
 
-  propagatedBuildInputs =
-    [deepseq mtl parallel parsec vector vectorAlgorithms mwcRandom statistics];
+  propagatedBuildInputs = [
+    deepseq mtl parallel parsec vector vectorAlgorithms mwcRandom statistics
+    Chart dataAccessor
+  ];
+
+  configureFlags = "-fchart";
 
   meta = {
     homepage = "http://bitbucket.org/bos/criterion";

pkgs/development/libraries/haskell/data-accessor/data-accessor-template.nix

@@ -0,0 +1,14 @@
+{cabal, dataAccessor, utilityHt}:
+
+cabal.mkDerivation (self : {
+  pname = "data-accessor-template";
+  version = "0.2.1.5";
+  sha256 = "0fvf1cacvqzyl9x88h7fa0d6p94qhkvf177a84g036qjxn0khyja";
+  propagatedBuildInputs = [dataAccessor utilityHt];
+  meta = {
+    description = "Utilities for accessing and manipulating the fields of records";
+    license = "BSD";
+    maintainers = [self.stdenv.lib.maintainers.andres];
+  };
+})  
+

pkgs/development/libraries/haskell/data-accessor/data-accessor.nix

@@ -0,0 +1,14 @@
+{cabal, transformers}:
+
+cabal.mkDerivation (self : {
+  pname = "data-accessor";
+  version = "0.2.1.4";
+  sha256 = "1fnfbcw1fzas2sbk9yhwd05ncvgqfy47hi9xh0ygsqilx7nwkdxv";
+  propagatedBuildInputs = [transformers];
+  meta = {
+    description = "Utilities for accessing and manipulating the fields of records";
+    license = "BSD";
+    maintainers = [self.stdenv.lib.maintainers.andres];
+  };
+})  
+

pkgs/development/libraries/szip/default.nix

@@ -0,0 +1,9 @@
+{ stdenv, fetchurl }:
+    
+stdenv.mkDerivation {
+    name = "szip-2.1";
+    src = fetchurl {
+        url = ftp://ftp.hdfgroup.org/lib-external/szip/2.1/src/szip-2.1.tar.gz;
+        sha256 = "05707lrdhwp8mv0dgzh2b6m2mwamv1z6k29m2v1v7pz0c1w2gb6z";
+    };
+}

pkgs/development/python-modules/pygobject/default.nix

@@ -1,11 +1,11 @@
 { stdenv, fetchurl, python, pkgconfig, glib }:
 
 stdenv.mkDerivation rec {
-  name = "pygobject-2.26.0";
+  name = "pygobject-2.27.0";
   
   src = fetchurl {
-    url = "http://ftp.gnome.org/pub/GNOME/sources/pygobject/2.26/${name}.tar.bz2";
-    sha256 = "5554acff9c27b647144143b0459359864e4a6f2ff62c7ba21cf310ad755cf7c7";
+    url = "http://ftp.gnome.org/pub/GNOME/sources/pygobject/2.27/${name}.tar.bz2";
+    sha256 = "18mq4mj9s9sw12m6gbbc4iffrq993c7q09v9yahlnamrqn3bv53m";
   };
 
   configureFlags = "--disable-introspection";

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

@@ -1,11 +1,11 @@
 { stdenv, fetchurl, perl, gdb, autoconf, automake }:
 
 stdenv.mkDerivation rec {
-  name = "valgrind-3.5.0";
+  name = "valgrind-3.6.0";
 
   src = fetchurl {
     url = "http://valgrind.org/downloads/${name}.tar.bz2";
-    sha256 = "105s4y6h5rsfvml1dfhsjvqgsxvnclbnxbpgk8b4ghpbpcr52fkl";
+    sha256 = "0pr8h0q909z15g2i2jrcryhqbshair42rylf3mprhyx4nm9h23xw";
   };
 
   # Make Valgrind compile with Glibc 2.12.

pkgs/misc/maven/3.0.nix

@@ -0,0 +1,15 @@
+{stdenv, fetchurl, jdk, makeWrapper}:
+
+assert jdk != null;
+
+stdenv.mkDerivation {
+	name = "apache-maven-3.0";
+	builder = ./builder.sh;
+	src = fetchurl {
+		url = mirror://apache/maven/binaries/apache-maven-3.0-bin.tar.gz;
+		sha256 = "18i7vf7w79pvga4k0plixv2ppdvm476cgikaxxnar1fac5v0qsh4";
+	};
+	
+        buildInputs = [makeWrapper]; 
+	inherit jdk;
+}

pkgs/tools/package-management/nix/sqlite.nix

@@ -1,22 +1,24 @@
 { stdenv, fetchurl, perl, curl, bzip2, sqlite, openssl ? null
+, pkgconfig, boehmgc
 , storeDir ? "/nix/store"
 , stateDir ? "/nix/var"
 }:
 
 stdenv.mkDerivation rec {
-  name = "nix-1.0pre23559";
+  name = "nix-1.0pre24749";
 
   src = fetchurl {
-    url = "http://hydra.nixos.org/build/614186/download/4/${name}.tar.bz2";
-    sha256 = "5c7fd783effc9c570f6feb5631f94e369a37de6b4fb2f51459964e48c465dcfa";
+    url = "http://hydra.nixos.org/build/757682/download/4/${name}.tar.bz2";
+    sha256 = "ab2bda296eb91a600d01a22ed4096acdf9b5d613f1155f98433d87e273a58970";
   };
 
-  buildInputs = [ perl curl openssl ];
+  buildInputs = [ perl curl openssl pkgconfig boehmgc ];
 
   configureFlags = ''
     --with-store-dir=${storeDir} --localstatedir=${stateDir}
     --with-bzip2=${bzip2} --with-sqlite=${sqlite}
     --disable-init-state
+    --enable-gc
     CFLAGS=-O3 CXXFLAGS=-O3
   '';
 

pkgs/tools/system/dd_rescue/default.nix

@@ -0,0 +1,63 @@
+x@{builderDefsPackage
+  , ...}:
+builderDefsPackage
+(a :  
+let 
+  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ 
+    [];
+
+  buildInputs = map (n: builtins.getAttr n x)
+    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
+  sourceInfo = rec {
+    baseName="dd_rescue";
+    version="1.22";
+    name="${baseName}-${version}";
+    url="http://www.garloff.de/kurt/linux/ddrescue/${name}.tar.gz";
+    hash="0n0vs4cn5csdcsmlndg3z36ws68zlckj17zrbm6wynrbs8iirclp";
+  };
+in
+rec {
+  src = a.fetchurl {
+    url = sourceInfo.url;
+    sha256 = sourceInfo.hash;
+  };
+  dd_rhelp_src = a.fetchurl {
+    url = "http://www.kalysto.org/pkg/dd_rhelp-0.1.2.tar.gz";
+    sha256 = "0fhzkflg1ygiaj5ha0bf594d76vlgjsfwlpcmwrbady9frxvlkvv";
+  };
+
+  inherit (sourceInfo) name version;
+  inherit buildInputs;
+
+  /* doConfigure should be removed if not needed */
+  phaseNames = ["doMakeInstall" "install_dd_rhelp" "fixPaths"];
+  makeFlags=[
+    ''prefix="$out"''
+    ''DESTDIR="$out"''
+    ''INSTASROOT=''
+  ];
+
+  fixPaths = a.doPatchShebangs ''$out/bin'';
+
+  install_dd_rhelp = a.fullDepEntry (''
+    ensureDir "$out/share/dd_rescue" "$out/bin"
+    tar xf "${dd_rhelp_src}" -C "$out/share/dd_rescue"
+    cp "$out/share/dd_rescue"/dd_rhelp*/dd_rhelp "$out/bin"
+  '') ["minInit" "defEnsureDir"];
+      
+  meta = {
+    description = "A tool to copy data from a damaged block device";
+    maintainers = with a.lib.maintainers;
+    [
+      raskin
+    ];
+    platforms = with a.lib.platforms;
+      linux;
+  };
+  passthru = {
+    updateInfo = {
+      downloadPage = "http://www.garloff.de/kurt/linux/ddrescue/";
+    };
+  };
+}) x
+

pkgs/top-level/all-packages.nix

@@ -537,6 +537,8 @@ let
 
   ddclient = callPackage ../tools/networking/ddclient { };
 
+  dd_rescue = callPackage ../tools/system/dd_rescue { };
+
   ddrescue = callPackage ../tools/system/ddrescue { };
 
   desktop_file_utils = callPackage ../tools/misc/desktop-file-utils { };
@@ -755,7 +757,7 @@ let
   hddtemp = callPackage ../tools/misc/hddtemp { };
 
   hdf5 = callPackage ../tools/misc/hdf5 { };
-
+  
   hevea = callPackage ../tools/typesetting/hevea { };
 
   highlight = callPackage ../tools/text/highlight { };
@@ -3894,6 +3896,8 @@ let
 
   sword = callPackage ../development/libraries/sword { };
 
+  szip = callPackage ../development/libraries/szip { };
+
   t1lib = callPackage ../development/libraries/t1lib { };
 
   taglib = callPackage ../development/libraries/taglib { };
@@ -5519,6 +5523,9 @@ let
     inherit (gtkLibs216) glib gtk;
   };
   eclipseLatest = eclipse.override { version = "latest"; };
+  eclipse36 = callPackage ../applications/editors/eclipse {
+      version = "3.6.1";
+  };
 
   ed = callPackage ../applications/editors/ed { };
 
@@ -6216,7 +6223,7 @@ let
 
   pythonmagick = callPackage ../applications/graphics/PythonMagick { };
 
-  qemu = callPackage ../applications/virtualization/qemu/0.12.3.nix { };
+  qemu = callPackage ../applications/virtualization/qemu/0.13.nix { };
 
   qemuSVN = callPackage ../applications/virtualization/qemu/svn-6642.nix { };
 
@@ -7115,8 +7122,8 @@ let
   martyr = callPackage ../development/libraries/martyr { };
 
   maven = callPackage ../misc/maven/maven-1.0.nix { };
-
   maven2 = callPackage ../misc/maven { };
+  maven3 = callPackage ../misc/maven/3.0.nix { };
 
   mess = callPackage ../misc/emulators/mess { };
 
@@ -7133,8 +7140,7 @@ let
   };
 
   # The SQLite branch.
-  nixSqlite = lowPrio (makeOverridable (import ../tools/package-management/nix/sqlite.nix) {
-    inherit fetchurl stdenv perl curl bzip2 openssl sqlite;
+  nixSqlite = lowPrio (callPackage ../tools/package-management/nix/sqlite.nix {
     storeDir = getPkgConfig "nix" "storeDir" "/nix/store";
     stateDir = getPkgConfig "nix" "stateDir" "/nix/var";
   });

pkgs/top-level/haskell-packages.nix

@@ -82,6 +82,8 @@ rec {
 
   cgi = callPackage ../development/libraries/haskell/cgi {};
 
+  Chart = callPackage ../development/libraries/haskell/Chart {};
+
   cmdargs = callPackage ../development/libraries/haskell/cmdargs {};
 
   colorizeHaskell = callPackage ../development/libraries/haskell/colorize-haskell {};
@@ -108,6 +110,10 @@ rec {
 
   csv = callPackage ../development/libraries/haskell/csv {};
 
+  dataAccessor = callPackage ../development/libraries/haskell/data-accessor/data-accessor.nix {};
+
+  dataAccessorTemplate = callPackage ../development/libraries/haskell/data-accessor/data-accessor-template.nix {};
+
   dataenc = callPackage ../development/libraries/haskell/dataenc {};
 
   dataReify = callPackage ../development/libraries/haskell/data-reify {};