Merge remote-tracking branch 'origin/master' into hardened-stdenv

pkgs/development/pharo/vm/default.nix

@@ -16,12 +16,12 @@ rec {
   };
 
   pharo-spur = pharo-vm-build rec {
-    version = "2016.04.04";
+    version = "2016.05.04";
     name = "pharo-vm-spur-i386-${version}";
     binary-basename = "pharo-spur-vm";
     src = fetchurl {
       url = "${base-url}/pharo-vm-spur-${version}.tar.bz2";
-      sha256 = "1kmf782vdk9xbzi2yn1vpzksv8m04ry8n2ih16jhcihibxzcmz23";
+      sha256 = "01xvpcp9mslxmfjpi43jhgf8jnx20dqngwrfyi838il61128hwq2";
     };
   };
 }

pkgs/development/pharo/vm/share.nix

@@ -26,6 +26,11 @@ stdenv.mkDerivation rec {
     sha256 = "1xq1721ql19hpgr8ir372h92q7g8zwd6k921b21dap4wf8djqnpd";
   };
 
+  sources50Zip = fetchurl {
+    url = http://files.pharo.org/sources/PharoV50.sources.zip;
+    sha256 = "0ykl1y0a4yy5qn8fwz0wkl8fcn4pqv9q0w0r2llhzdz3jdg1k69g";
+  };
+
   buildInputs = [ unzip ];
 
   installPhase = ''
@@ -37,6 +42,7 @@ stdenv.mkDerivation rec {
     unzip ${sources20Zip} -d $prefix/lib/
     unzip ${sources30Zip} -d $prefix/lib/
     unzip ${sources40Zip} -d $prefix/lib/
+    unzip ${sources50Zip} -d $prefix/lib/
   '';
 
   meta = {