diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2021-07-08 02:42:09 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-08 02:42:09 +0200 |
| commit | 5da034ebe2fc485f2ce0fc6578c49438554b17e4 (patch) | |
| tree | be23a69154012766d6baf6b1b9c2c938368e6731 /pkgs/development/compilers | |
| parent | c66fc155fd82167695aa0d6f9646890f72184d09 (diff) | |
| parent | c08ea1ff47e663208892f8120b07a6b5327d5e59 (diff) | |
| download | nixpkgs-5da034ebe2fc485f2ce0fc6578c49438554b17e4.tar nixpkgs-5da034ebe2fc485f2ce0fc6578c49438554b17e4.tar.gz nixpkgs-5da034ebe2fc485f2ce0fc6578c49438554b17e4.tar.bz2 nixpkgs-5da034ebe2fc485f2ce0fc6578c49438554b17e4.tar.lz nixpkgs-5da034ebe2fc485f2ce0fc6578c49438554b17e4.tar.xz nixpkgs-5da034ebe2fc485f2ce0fc6578c49438554b17e4.tar.zst nixpkgs-5da034ebe2fc485f2ce0fc6578c49438554b17e4.zip | |
Merge pull request #129572 from redvers/ponyc-0.42.0
ponyc: 0.41.1 -> 0.42.0
Diffstat (limited to 'pkgs/development/compilers')
| -rw-r--r-- | pkgs/development/compilers/ponyc/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/compilers/ponyc/make-safe-for-sandbox.patch | 14 |
2 files changed, 9 insertions, 9 deletions
diff --git a/pkgs/development/compilers/ponyc/default.nix b/pkgs/development/compilers/ponyc/default.nix index 36a83d47d6f..086d4d30127 100644 --- a/pkgs/development/compilers/ponyc/default.nix +++ b/pkgs/development/compilers/ponyc/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation (rec { pname = "ponyc"; - version = "0.41.1"; + version = "0.42.0"; src = fetchFromGitHub { owner = "ponylang"; repo = pname; rev = version; - sha256 = "02wx070cy1193xzv58vh79yzwgpqiayqlwd3i285698fppbcg69a"; + sha256 = "1s8glmzz0g5lj1fjwwy4m3n660smiq5wl9r1lg686wqh42hcgnsy"; # 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). diff --git a/pkgs/development/compilers/ponyc/make-safe-for-sandbox.patch b/pkgs/development/compilers/ponyc/make-safe-for-sandbox.patch index 49addcbc616..8190cc2ee02 100644 --- a/pkgs/development/compilers/ponyc/make-safe-for-sandbox.patch +++ b/pkgs/development/compilers/ponyc/make-safe-for-sandbox.patch @@ -1,21 +1,21 @@ ---- a/lib/CMakeLists.txt 2021-05-27 15:58:36.819331229 -0400 -+++ b/lib/CMakeLists.txt 2021-05-27 16:00:19.768268649 -0400 -@@ -10,12 +10,12 @@ +--- a/lib/CMakeLists.txt.orig 2021-07-07 13:40:20.209410160 -0400 ++++ a/lib/CMakeLists.txt 2021-07-07 13:43:11.886969662 -0400 +@@ -15,12 +15,12 @@ endif() ExternalProject_Add(gbenchmark -- URL https://github.com/google/benchmark/archive/v1.5.2.tar.gz -+ SOURCE_DIR gbenchmark-prefix/src/benchmark +- URL ${PONYC_GBENCHMARK_URL} ++ SOURCE_DIR gbenchmark-prefix/src/benchmark CMAKE_ARGS -DCMAKE_BUILD_TYPE=${PONYC_LIBS_BUILD_TYPE} -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX} -DBENCHMARK_ENABLE_GTEST_TESTS=OFF -DCMAKE_CXX_FLAGS=-fpic --no-warn-unused-cli ) ExternalProject_Add(googletest - URL https://github.com/google/googletest/archive/release-1.8.1.tar.gz -+ URL @googletest@ ++ URL @googletest@ CMAKE_ARGS -DCMAKE_BUILD_TYPE=${PONYC_LIBS_BUILD_TYPE} -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX} -DCMAKE_CXX_FLAGS=-fpic -Dgtest_force_shared_crt=ON --no-warn-unused-cli ) -@@ -28,75 +28,6 @@ +@@ -33,75 +33,6 @@ COMPONENT library ) |