JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #113234 from Trundle/ponyc-0.38.3

Browse Source 
ponyc: 0.38.1 -> 0.38.3
This commit is contained in:
Daniël de Kok 2021-02-17 09:04:17 +01:00 committed by GitHub
commit 58674cfe7e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/development/compilers/ponyc/default.nix
View File

@ -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 }: cc ? stdenv.cc, lto ? !stdenv.isDarwin }:
stdenv.mkDerivation (rec { stdenv.mkDerivation (rec {
pname = "ponyc"; pname = "ponyc";
version = "0.38.1"; version = "0.38.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ponylang"; owner = "ponylang";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "1hk810k9h3bl641pgw91y4x2qw67rvbapx6p2pk9qz5p7nfcn7qh"; sha256 = "14kivmyphi7gbd7mgd4cnsiwl4cl7wih8kwzh7n79s2s4c5hj4ak";
# Due to a bug in LLVM 9.x, ponyc has to include its own vendored patched # 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). # LLVM. (The submodule is a specific tag in the LLVM source tree).
@ -24,7 +24,7 @@ stdenv.mkDerivation (rec {
}; };
ponygbenchmark = fetchurl { 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"; sha256 = "06i2cr4rj126m1zfz0x1rbxv1mw1l7a11mzal5kqk56cdrdicsiw";
name = "v1.5.0.tar.gz"; name = "v1.5.0.tar.gz";
}; };
@ -39,7 +39,7 @@ stdenv.mkDerivation (rec {
(substituteAll { (substituteAll {
src = ./make-safe-for-sandbox.patch; src = ./make-safe-for-sandbox.patch;
googletest = fetchurl { 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"; sha256 = "17147961i01fl099ygxjx4asvjanwdd446nwbq9v8156h98zxwcv";
name = "release-1.8.1.tar.gz"; name = "release-1.8.1.tar.gz";
}; };
@ -95,7 +95,7 @@ stdenv.mkDerivation (rec {
wrapProgram $out/bin/ponyc \ wrapProgram $out/bin/ponyc \
--prefix PATH ":" "${stdenv.cc}/bin" \ --prefix PATH ":" "${stdenv.cc}/bin" \
--set-default CC "$CC" \ --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 # Stripping breaks linking for ponyc