Merge remote-tracking branch 'upstream/master' into staging

This commit is contained in:
Tuomas Tynkkynen
2017-07-11 14:16:21 +03:00
76 changed files with 875 additions and 379 deletions

View File

@@ -3,13 +3,13 @@
stdenv.mkDerivation ( rec {
name = "ponyc-${version}";
version = "0.14.0";
version = "0.15.0";
src = fetchFromGitHub {
owner = "ponylang";
repo = "ponyc";
rev = version;
sha256 = "0zzr3mmjp7010d3jfly6lbwaib546praml97kgj92yixahnwz533";
sha256 = "02hmn066jswaij2ib0faabm2i9cqz562z6s0vakgwnxyrk4qayif";
};
buildInputs = [ llvm makeWrapper which ];

View File

@@ -1,13 +1,13 @@
{stdenv, fetchFromGitHub, ponyc }:
stdenv.mkDerivation {
name = "pony-stable-unstable-2017-03-30";
name = "pony-stable-unstable-2017-04-20";
src = fetchFromGitHub {
owner = "jemc";
owner = "ponylang";
repo = "pony-stable";
rev = "39890c7f11f79009630de6b551bd076868f7f5a2";
sha256 = "1w15dg4l03zzncpllwww8jhsj7z1wgvhf89n7agr9f1w9m2zpskc";
rev = "b2ea566b02ec40480f888652b04eaa5f191a241e";
sha256 = "1bixkxccsrnyip3yp42r14rbhk832pvzwbkh6ash4ip2isxa6b19";
};
buildInputs = [ ponyc ];