about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJoachim F <joachifm@users.noreply.github.com>2016-12-02 03:17:06 +0100
committerGitHub <noreply@github.com>2016-12-02 03:17:06 +0100
commit097b4be1d5ec2cb7934fc044a447e543488a975d (patch)
tree638f7180beb758fb462a86e5813dfc8c9d46a219
parent5afc6b506cc6e96cd03008a6f014edfbf1cfa432 (diff)
parentd4858edf57f1e3d89f136ea96436979a614aefdc (diff)
downloadnixlib-097b4be1d5ec2cb7934fc044a447e543488a975d.tar
nixlib-097b4be1d5ec2cb7934fc044a447e543488a975d.tar.gz
nixlib-097b4be1d5ec2cb7934fc044a447e543488a975d.tar.bz2
nixlib-097b4be1d5ec2cb7934fc044a447e543488a975d.tar.lz
nixlib-097b4be1d5ec2cb7934fc044a447e543488a975d.tar.xz
nixlib-097b4be1d5ec2cb7934fc044a447e543488a975d.tar.zst
nixlib-097b4be1d5ec2cb7934fc044a447e543488a975d.zip
Merge pull request #20845 from kamilchm/ponyc
ponyc: 0.6.0 -> 0.9.0
-rw-r--r--pkgs/development/compilers/ponyc/default.nix6
-rw-r--r--pkgs/development/compilers/ponyc/disable-tests.patch18
2 files changed, 14 insertions, 10 deletions
diff --git a/pkgs/development/compilers/ponyc/default.nix b/pkgs/development/compilers/ponyc/default.nix
index 122b9ff7ed1a..2bce01551ee5 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.6.0";
+  version = "0.9.0";
 
   src = fetchFromGitHub {
     owner = "ponylang";
     repo = "ponyc";
     rev = version;
-    sha256 = "10miwsyxl589b0n1h3dbbc2qckq8z8a58s0d53asq88w2gpc339q";
+    sha256 = "1g2i3x9k36h5rx7ifx0i6hn78xlj42i86x8apwzvkh0y84y88adi";
   };
 
   buildInputs = [ llvm makeWrapper which ];
@@ -83,7 +83,7 @@ stdenv.mkDerivation ( rec {
     description = "Pony is an Object-oriented, actor-model, capabilities-secure, high performance programming language";
     homepage = http://www.ponylang.org;
     license = stdenv.lib.licenses.bsd2;
-    maintainers = [ stdenv.lib.maintainers.doublec ];
+    maintainers = with stdenv.lib.maintainers; [ doublec kamilchm ];
     platforms = stdenv.lib.platforms.unix;
   };
 })
diff --git a/pkgs/development/compilers/ponyc/disable-tests.patch b/pkgs/development/compilers/ponyc/disable-tests.patch
index 696dc005f0ab..38740cf963eb 100644
--- a/pkgs/development/compilers/ponyc/disable-tests.patch
+++ b/pkgs/development/compilers/ponyc/disable-tests.patch
@@ -1,15 +1,19 @@
-diff --git a/packages/net/_test.pony b/packages/net/_test.pony
-index ce26bd7..9a98cc7 100644
---- a/packages/net/_test.pony
-+++ b/packages/net/_test.pony
-@@ -5,9 +5,7 @@ actor Main is TestList
+diff -Naur a/packages/net/_test.pony b/packages/net/_test.pony
+--- a/packages/net/_test.pony	1970-01-01 01:00:01.000000000 +0100
++++ b/packages/net/_test.pony	2016-12-01 22:25:59.102433053 +0100
+@@ -5,14 +5,7 @@
    new make() => None
-
+ 
    fun tag tests(test: PonyTest) =>
 -    test(_TestBroadcast)
 -    test(_TestTCPWritev)
 -    test(_TestTCPExpect)
+-    test(_TestTCPMute)
+-    test(_TestTCPUnmute)
+-    ifdef not windows then
+-      test(_TestTCPThrottle)
+-    end
 +    None
-
+ 
  class _TestPing is UDPNotify
    let _h: TestHelper