svn merge trunk

svn path=/nixpkgs/branches/libpng15/; revision=29632

pkgs/development/libraries/dotnetfx40/default.nix

···
+{stdenv}:
+
+let
+  windir = "/cygdrive/c/WINDOWS";
+in
+{
+  pkg = stdenv.mkDerivation {
+    name = "dotnetfx-4.0";
+    src = "${windir}/Microsoft.NET/Framework/v4.0.30319";
+    buildCommand = ''
+      ensureDir $out/bin
+      ln -s $src/MSBuild.exe $out/bin
+    '';
+  };
+  
+  assembly20Path = "/cygdrive/c/WINDOWS/Microsoft.NET/Framework/v2.0.50727";
+  
+  wcfPath = "/cygdrive/c/WINDOWS/Microsoft.NET/Framework/v3.0/WINDOW~1";
+  
+  referenceAssembly30Path = "/cygdrive/c/PROGRA~1/REFERE~1/Microsoft/Framework/v3.0";
+  
+  referenceAssembly35Path = "/cygdrive/c/PROGRA~1/REFERE~1/Microsoft/Framework/v3.5";
+}

pkgs/top-level/all-packages.nix

···
 
   dotnetenv = import ../build-support/dotnetenv {
     inherit stdenv;
-    dotnetfx = dotnetfx35;
+    dotnetfx = dotnetfx40;
   };
 
   vsenv = callPackage ../build-support/vsenv {
···
   dosfstools = callPackage ../tools/filesystems/dosfstools { };
 
   dotnetfx35 = callPackage ../development/libraries/dotnetfx35 { };
+
+  dotnetfx40 = callPackage ../development/libraries/dotnetfx40 { };
 
   dropbear = callPackage ../tools/networking/dropbear {
     enableStatic = true;