diff options
| author | Franz Pletz <fpletz@fnordicwalking.de> | 2016-05-18 17:10:02 +0200 |
|---|---|---|
| committer | Franz Pletz <fpletz@fnordicwalking.de> | 2016-05-18 17:10:02 +0200 |
| commit | f8d481754cf842ca6e6ac1427ce0f571f5a44108 (patch) | |
| tree | 70e702285987429aed275e0d5e2dc15c050e1f8c /pkgs/development/pharo | |
| parent | 9fbc20e2f89bc045efac7ade41949a2c2d571dec (diff) | |
| parent | 3cd63ade1614d4c581735ffb0cebe181bf87dfc8 (diff) | |
Merge remote-tracking branch 'origin/master' into hardened-stdenv
Diffstat (limited to 'pkgs/development/pharo')
| -rw-r--r-- | pkgs/development/pharo/vm/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/pharo/vm/share.nix | 6 |
2 files changed, 8 insertions, 2 deletions
diff --git a/pkgs/development/pharo/vm/default.nix b/pkgs/development/pharo/vm/default.nix index 2dc3cbc3ff99..0ebbb34f8ae7 100644 --- a/pkgs/development/pharo/vm/default.nix +++ b/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"; }; }; } diff --git a/pkgs/development/pharo/vm/share.nix b/pkgs/development/pharo/vm/share.nix index 27485af6f989..46d253342609 100644 --- a/pkgs/development/pharo/vm/share.nix +++ b/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 = { |