Merge pull request #7745 from obadz/mono

mono 3.12.1 -> 4.0.1

2 files changed, 70 insertions, 34 deletions

diff --git a/pkgs/applications/editors/monodevelop/default.nix b/pkgs/applications/editors/monodevelop/default.nix
index 4e8e6079ff16..b04e37746e05 100644
--- a/pkgs/applications/editors/monodevelop/default.nix
+++ b/pkgs/applications/editors/monodevelop/default.nix
@@ -4,49 +4,84 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "5.7.0.660";
-  revision = "6a74f9bdb90d9415b597064d815c9be38b401fee";
+  version = "5.9.0.431";
+  revision = "7560726734fc7267de2fa9abed2509968deefaa8";
   name = "monodevelop-${version}";
 
-  srcs = [
-    (fetchurl {
-      url = "http://download.mono-project.com/sources/monodevelop/${name}.tar.bz2";
-      sha256 = "0i9fpjkcys991dhxh02zf9imar3aj6fldk9ymy09vmr10f4d7vbf";
-    })
-    (fetchurl {
-      url = "https://launchpadlibrarian.net/153448659/NUnit-2.6.3.zip";
-      sha256 = "0vzbziq44zy7fyyhb44mf9ypfi7gvs17rxpg8c9d9lvvdpkshhcp";
-    })
-    (fetchurl {
-      url = "https://launchpadlibrarian.net/68057829/NUnit-2.5.10.11092.zip";
-      sha256 = "0k5h5bz1p2v3d0w0hpkpbpvdkcszgp8sr9ik498r1bs72w5qlwnc";
-    })
-    (fetchgit {
-      url = "https://github.com/mono/nuget-binary.git";
-      rev = "ecb27dd49384d70b6c861d28763906f2b25b7c8";
-      sha256 = "0dj0yglgwn07xw2crr66vl0vcgnr6m041pynyq0kdd0z8nlp92ki";
-    })
-  ];
+  src = fetchurl {
+    url = "http://download.mono-project.com/sources/monodevelop/${name}.tar.bz2";
+    sha256 = "1bgqvlfi6pilj2zxsviqilh63qq98wsijqdiqwpkqchcw741zlyn";
+  };
+
+  srcNugetBinary = fetchgit {
+    url = "https://github.com/mono/nuget-binary.git";
+    rev = "da1f2102f8172df6f7a1370a4998e3f88b91c047";
+    sha256 = "1hbnckc4gvqkknf8gh1k7iwqb4vdzifdjd19i60fnczly5v8m1c3";
+  };
+
+  srcNUnit = fetchurl {
+    url = "https://www.nuget.org/api/v2/package/NUnit/2.6.3";
+    sha256 = "0bb16i4ggwz32wkxsh485wf014cqqzhbyx0b3wbpmqjw7p4canph";
+  };
+
+  srcNUnitRunners = fetchurl {
+    url = "https://www.nuget.org/api/v2/package/NUnit.Runners/2.6.3";
+    sha256 = "0qwx1i9lxkp9pijj2bsczzgsamz651hngkxraqjap1v4m7d09a3b";
+  };
+
+  srcNUnit2510 = fetchurl {
+    url = "http://launchpad.net/nunitv2/2.5/2.5.10/+download/NUnit-2.5.10.11092.zip";
+    sha256 = "0k5h5bz1p2v3d0w0hpkpbpvdkcszgp8sr9ik498r1bs72w5qlwnc";
+  };
+
+  srcNugetSystemWebMvcExtensions = fetchurl {
+    url = https://www.nuget.org/api/v2/package/System.Web.Mvc.Extensions.Mvc.4/1.0.9;
+    sha256 = "19wi662m8primpimzifv8k560m6ymm73z0mf1r8ixl0xqag1hx6j";
+  };
+
+  srcNugetMicrosoftAspNetMvc = fetchurl {
+    url = https://www.nuget.org/api/v2/package/Microsoft.AspNet.Mvc/5.2.2;
+    sha256 = "1jwfmz42kw2yb1g2hgp2h34fc4wx6s8z71da3mw5i4ivs25w9n2b";
+  };
 
-  sourceRoot = "monodevelop-5.7";
+  srcNugetMicrosoftAspNetRazor = fetchurl {
+    url = https://www.nuget.org/api/v2/package/Microsoft.AspNet.Razor/3.2.2;
+    sha256 = "1db3apn4vzz1bx6q5fyv6nyx0drz095xgazqbw60qnhfs7z45axd";
+  };
+
+  srcNugetMicrosoftAspNetWebPages = fetchurl {
+    url = https://www.nuget.org/api/v2/package/Microsoft.AspNet.WebPages/3.2.2;
+    sha256 = "17fwb5yj165sql80i47zirjnm0gr4n8ypz408mz7p8a1n40r4i5l";
+  };
+
+  srcNugetMicrosoftWebInfrastructure = fetchurl {
+    url = https://www.nuget.org/api/v2/package/Microsoft.Web.Infrastructure/1.0.0.0;
+    sha256 = "1mxl9dri5729d0jl84gkpqifqf4xzb6aw1rzcfh6l0r24bix9afn";
+  };
 
   postPatch = ''
     # From https://bugzilla.xamarin.com/show_bug.cgi?id=23696#c19
 
     # it seems parts of MonoDevelop 5.2+ need NUnit 2.6.4, which isn't included
     # (?), so download it and put it in the right place in the tree
-    mkdir -v -p packages/NUnit.2.6.3/lib
-    cp -vfR ../NUnit-2.6.3/bin/framework/* packages/NUnit.2.6.3/lib
-    mkdir -v -p packages/NUnit.Runners.2.6.3/tools/lib
-    cp -vfR ../NUnit-2.6.3/bin/lib/* packages/NUnit.Runners.2.6.3/tools/lib
+    mkdir packages
+    unzip ${srcNUnit} -d packages/NUnit.2.6.3
+    unzip ${srcNUnitRunners} -d packages/NUnit.Runners.2.6.3
 
     # cecil needs NUnit 2.5.10 - this is also missing from the tar
-    cp -vfR ../NUnit-2.5.10.11092/bin/net-2.0/framework/* external/cecil/Test/libs/nunit-2.5.10
+    unzip -j ${srcNUnit2510} -d external/cecil/Test/libs/nunit-2.5.10 NUnit-2.5.10.11092/bin/net-2.0/framework/\*
 
     # the tar doesn't include the nuget binary, so grab it from github and copy it
     # into the right place
-    cp -vfR ../nuget-binary-*/* external/nuget-binary/
-    '';
+    cp -vfR ${srcNugetBinary}/* external/nuget-binary/
+
+    # AspNet plugin requires these packages
+    unzip ${srcNugetSystemWebMvcExtensions} -d packages/System.Web.Mvc.Extensions.Mvc.4.1.0.9
+    unzip ${srcNugetMicrosoftAspNetMvc} -d packages/Microsoft.AspNet.Mvc.5.2.2
+    unzip ${srcNugetMicrosoftAspNetRazor} -d packages/Microsoft.AspNet.Razor.3.2.2
+    unzip ${srcNugetMicrosoftAspNetWebPages} -d packages/Microsoft.AspNet.WebPages.3.2.2
+    unzip ${srcNugetMicrosoftWebInfrastructure} -d packages/Microsoft.Web.Infrastructure.1.0.0.0
+  '';
 
   buildInputs = [
     autoconf automake pkgconfig shared_mime_info intltool
@@ -54,6 +89,7 @@ stdenv.mkDerivation rec {
   ];
 
   preConfigure = "patchShebangs ./configure";
+
   preBuild = ''
     cat > ./buildinfo <<EOF
     Release ID: ${version}
diff --git a/pkgs/development/compilers/mono/default.nix b/pkgs/development/compilers/mono/default.nix
index a9e0dd89e84c..ba2ce00cfb56 100644
--- a/pkgs/development/compilers/mono/default.nix
+++ b/pkgs/development/compilers/mono/default.nix
@@ -6,10 +6,10 @@ let
 in
 stdenv.mkDerivation rec {
   name = "mono-${version}";
-  version = "3.12.1";
+  version = "4.0.1";
   src = fetchurl {
     url = "http://download.mono-project.com/sources/mono/${name}.tar.bz2";
-    sha256 = "03dn68vignknzxy1rx75p16qx1ild27hixgvr5mw0j19mx9z332x";
+    sha256 = "1kjv1zhcmd2qfr89vkaas6541n5jfzisn3y030l6lg6lp3ria7zz";
   };
 
   buildInputs = [bison pkgconfig glib gettext perl libgdiplus libX11 ncurses zlib];
@@ -40,9 +40,9 @@ stdenv.mkDerivation rec {
     substituteInPlace mono/mini/aot-compiler.c --replace "llvm_path = g_strdup (\"\")" "llvm_path = g_strdup (\"${llvm}/bin/\")"
   '';
 
-  #Fix mono DLLMap so it can find libX11 and gdiplus to run winforms apps
-  #Other items in the DLLMap may need to be pointed to their store locations, I don't think this is exhaustive
-  #http://www.mono-project.com/Config_DllMap
+  # Fix mono DLLMap so it can find libX11 and gdiplus to run winforms apps
+  # Other items in the DLLMap may need to be pointed to their store locations, I don't think this is exhaustive
+  # http://www.mono-project.com/Config_DllMap
   postBuild = ''
     find . -name 'config' -type f | while read i; do
         sed -i "s@libX11.so.6@${libX11}/lib/libX11.so.6@g" $i