From 8f655e2d50dad0f712947b1ec023eb83cb0b0df4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20St=C3=BChrk?= Date: Mon, 15 Feb 2021 22:32:07 +0100 Subject: [PATCH 1/2] ponyc: 0.38.1 -> 0.38.3 New upstream release. Also switched from libressl to openssl because it makes using the net_ssl package easier. --- pkgs/development/compilers/ponyc/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/ponyc/default.nix b/pkgs/development/compilers/ponyc/default.nix index 3a2e3c4b944..61ecf89edcd 100644 --- a/pkgs/development/compilers/ponyc/default.nix +++ b/pkgs/development/compilers/ponyc/default.nix @@ -1,15 +1,15 @@ -{ lib, stdenv, fetchFromGitHub, fetchurl, makeWrapper, pcre2, coreutils, which, libressl, libxml2, cmake, z3, substituteAll, +{ lib, stdenv, fetchFromGitHub, fetchurl, makeWrapper, pcre2, coreutils, which, openssl, libxml2, cmake, z3, substituteAll, cc ? stdenv.cc, lto ? !stdenv.isDarwin }: stdenv.mkDerivation (rec { pname = "ponyc"; - version = "0.38.1"; + version = "0.38.3"; src = fetchFromGitHub { owner = "ponylang"; repo = pname; rev = version; - sha256 = "1hk810k9h3bl641pgw91y4x2qw67rvbapx6p2pk9qz5p7nfcn7qh"; + sha256 = "14kivmyphi7gbd7mgd4cnsiwl4cl7wih8kwzh7n79s2s4c5hj4ak"; # Due to a bug in LLVM 9.x, ponyc has to include its own vendored patched # LLVM. (The submodule is a specific tag in the LLVM source tree). @@ -95,7 +95,7 @@ stdenv.mkDerivation (rec { wrapProgram $out/bin/ponyc \ --prefix PATH ":" "${stdenv.cc}/bin" \ --set-default CC "$CC" \ - --prefix PONYPATH : "${lib.makeLibraryPath [ pcre2 libressl (placeholder "out") ]}" + --prefix PONYPATH : "${lib.makeLibraryPath [ pcre2 openssl (placeholder "out") ]}" ''; # Stripping breaks linking for ponyc From f5ccc3e5fe6a06f6c6f71f58e02f1928ce9ee2e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20St=C3=BChrk?= Date: Tue, 16 Feb 2021 19:57:07 +0100 Subject: [PATCH 2/2] ponyc: Replace URI literals --- pkgs/development/compilers/ponyc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/ponyc/default.nix b/pkgs/development/compilers/ponyc/default.nix index 61ecf89edcd..9fc8188daa1 100644 --- a/pkgs/development/compilers/ponyc/default.nix +++ b/pkgs/development/compilers/ponyc/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation (rec { }; ponygbenchmark = fetchurl { - url = https://github.com/google/benchmark/archive/v1.5.0.tar.gz; + url = "https://github.com/google/benchmark/archive/v1.5.0.tar.gz"; sha256 = "06i2cr4rj126m1zfz0x1rbxv1mw1l7a11mzal5kqk56cdrdicsiw"; name = "v1.5.0.tar.gz"; }; @@ -39,7 +39,7 @@ stdenv.mkDerivation (rec { (substituteAll { src = ./make-safe-for-sandbox.patch; googletest = fetchurl { - url = https://github.com/google/googletest/archive/release-1.8.1.tar.gz; + url = "https://github.com/google/googletest/archive/release-1.8.1.tar.gz"; sha256 = "17147961i01fl099ygxjx4asvjanwdd446nwbq9v8156h98zxwcv"; name = "release-1.8.1.tar.gz"; };