about summary refs log tree commit diff
path: root/pkgs/development/compilers
diff options
context:
space:
mode:
authorTuomas Tynkkynen <tuomas.tynkkynen@iki.fi>2017-07-11 14:16:21 +0300
committerTuomas Tynkkynen <tuomas.tynkkynen@iki.fi>2017-07-11 14:16:21 +0300
commit43ff1c82627a9d77988260e08a86d5e8dbccc4b7 (patch)
treede7ae4427b33059660d0b34701071717d9a60bfa /pkgs/development/compilers
parentf385e224e5962cc80026171249a230d7111cc9bf (diff)
parentb61238243c978cde19a0676f3da9e3fd575e55fc (diff)
downloadnixlib-43ff1c82627a9d77988260e08a86d5e8dbccc4b7.tar
nixlib-43ff1c82627a9d77988260e08a86d5e8dbccc4b7.tar.gz
nixlib-43ff1c82627a9d77988260e08a86d5e8dbccc4b7.tar.bz2
nixlib-43ff1c82627a9d77988260e08a86d5e8dbccc4b7.tar.lz
nixlib-43ff1c82627a9d77988260e08a86d5e8dbccc4b7.tar.xz
nixlib-43ff1c82627a9d77988260e08a86d5e8dbccc4b7.tar.zst
nixlib-43ff1c82627a9d77988260e08a86d5e8dbccc4b7.zip
Merge remote-tracking branch 'upstream/master' into staging
Diffstat (limited to 'pkgs/development/compilers')
-rw-r--r--pkgs/development/compilers/ponyc/default.nix4
-rw-r--r--pkgs/development/compilers/ponyc/pony-stable.nix8
2 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/development/compilers/ponyc/default.nix b/pkgs/development/compilers/ponyc/default.nix
index 6b7f87b1e954..6e393426b7a8 100644
--- a/pkgs/development/compilers/ponyc/default.nix
+++ b/pkgs/development/compilers/ponyc/default.nix
@@ -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 ];
diff --git a/pkgs/development/compilers/ponyc/pony-stable.nix b/pkgs/development/compilers/ponyc/pony-stable.nix
index 9bee8e299c02..c91d9d603d54 100644
--- a/pkgs/development/compilers/ponyc/pony-stable.nix
+++ b/pkgs/development/compilers/ponyc/pony-stable.nix
@@ -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 ];