diff options
| -rw-r--r-- | pkgs/development/compilers/ponyc/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/development/compilers/ponyc/disable-tests.patch | 18 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/kernel/linux-4.1.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 2 |
4 files changed, 17 insertions, 13 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 diff --git a/pkgs/os-specific/linux/kernel/linux-4.1.nix b/pkgs/os-specific/linux/kernel/linux-4.1.nix index 67d8d267b546..b7f988299313 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.1.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.1.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.1.35"; + version = "4.1.36"; extraMeta.branch = "4.1"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0jn09hs91d5fi6615v9fnbpggyh1x192q6faggpbb90q110g0jjl"; + sha256 = "140my5r39w795gsaglqxaw97hwpy8qf95c6hy2cr7a122bgnslp1"; }; kernelPatches = args.kernelPatches; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3f730ebe77a7..7ae28a275b39 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -60,7 +60,7 @@ in { meta = { description = "A package for acousticians"; maintainer = with maintainers; [ fridh ]; - license = with licenses; [ bsd ]; + license = with licenses; [ bsd3 ]; homepage = https://github.com/python-acoustics/python-acoustics; }; }; |