Merge remote-tracking branch 'lukego/pharo6-for-nixpkgs'

Closes https://github.com/NixOS/nixpkgs/pull/26924
This commit is contained in:
Joachim Fasting
2017-08-26 15:17:21 +02:00
10 changed files with 395 additions and 92 deletions

View File

@@ -6580,10 +6580,11 @@ with pkgs;
guile-xcb = callPackage ../development/guile-modules/guile-xcb { };
pharo-vms = callPackage_i686 ../development/pharo/vm { };
pharo-vm = pharo-vms.pharo-no-spur;
pharo-vm5 = pharo-vms.pharo-spur;
pharo-vms = callPackage ../development/pharo/vm { };
pharo = pharo-vms.multi-vm-wrapper;
pharo-cog32 = pharo-vms.cog32;
pharo-spur32 = pharo-vms.spur32;
pharo-spur64 = assert stdenv.is64bit; pharo-vms.spur64;
pharo-launcher = callPackage ../development/pharo/launcher { };
srecord = callPackage ../development/tools/misc/srecord { };