From f4286686cbc570a6ea405911b065d3e183eba737 Mon Sep 17 00:00:00 2001
From: LordMZTE <lord@mzte.de>
Date: Sun, 6 Apr 2025 14:47:24 +0200
Subject: [PATCH] ponyc: 0.58.6 -> 0.59.0

This also fixes a build issue that broke the package before, further
described in #392168

Resolves #392168
---
 pkgs/development/compilers/ponyc/default.nix | 17 +++++++++--------
 pkgs/top-level/all-packages.nix              |  5 +----
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/compilers/ponyc/default.nix b/pkgs/development/compilers/ponyc/default.nix
index a78cd863dabd..04383fe65153 100644
--- a/pkgs/development/compilers/ponyc/default.nix
+++ b/pkgs/development/compilers/ponyc/default.nix
@@ -4,6 +4,7 @@
   fetchFromGitHub,
   cmake,
   coreutils,
+  gcc,
   libxml2,
   lto ? true,
   makeWrapper,
@@ -22,30 +23,30 @@
 
 stdenv.mkDerivation (rec {
   pname = "ponyc";
-  version = "0.58.6";
+  version = "0.59.0";
 
   src = fetchFromGitHub {
     owner = "ponylang";
     repo = pname;
     rev = version;
-    hash = "sha256-cCZo/lOvSvF19SGQ9BU2J3EBKHF9PgRBhuUVBkggF9I=";
+    hash = "sha256-4gDv8UWTk0RWVNC4PU70YKSK9fIMbWBsQbHboVls2BA=";
     fetchSubmodules = true;
   };
 
-  benchmarkRev = "1.7.1";
+  benchmarkRev = "1.9.1";
   benchmark = fetchFromGitHub {
     owner = "google";
     repo = "benchmark";
     rev = "v${benchmarkRev}";
-    hash = "sha256-gg3g/0Ki29FnGqKv9lDTs5oA9NjH23qQ+hTdVtSU+zo=";
+    hash = "sha256-5xDg1duixLoWIuy59WT0r5ZBAvTR6RPP7YrhBYkMxc8=";
   };
 
-  googletestRev = "1.12.1";
+  googletestRev = "1.15.2";
   googletest = fetchFromGitHub {
     owner = "google";
     repo = "googletest";
-    rev = "release-${googletestRev}";
-    hash = "sha256-W+OxRTVtemt2esw4P7IyGWXOonUN5ZuscjvzqkYvZbM=";
+    rev = "v${googletestRev}";
+    hash = "sha256-1OJ2SeSscRBNr7zZ/a8bJGIqAnhkg45re0j3DtPfcXM=";
   };
 
   nativeBuildInputs = [
@@ -91,7 +92,7 @@ stdenv.mkDerivation (rec {
     # Replace downloads with local copies.
     substituteInPlace lib/CMakeLists.txt \
         --replace-fail "https://github.com/google/benchmark/archive/v$benchmarkRev.tar.gz" "$NIX_BUILD_TOP/deps/benchmark-$benchmarkRev.tar" \
-        --replace-fail "https://github.com/google/googletest/archive/release-$googletestRev.tar.gz" "$NIX_BUILD_TOP/deps/googletest-$googletestRev.tar"
+        --replace-fail "https://github.com/google/googletest/archive/refs/tags/v$googletestRev.tar.gz" "$NIX_BUILD_TOP/deps/googletest-$googletestRev.tar"
   '';
 
   preBuild = ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 038c4fa1352b..ee6f685889c2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6799,10 +6799,7 @@ with pkgs;
   open-watcom-bin-unwrapped = callPackage ../development/compilers/open-watcom/bin.nix { };
   open-watcom-bin = wrapWatcom open-watcom-bin-unwrapped { };
 
-  ponyc = callPackage ../development/compilers/ponyc {
-    # Upstream pony no longer supports GCC
-    stdenv = llvmPackages.stdenv;
-  };
+  ponyc = callPackage ../development/compilers/ponyc { };
 
   pony-corral = callPackage ../development/compilers/ponyc/pony-corral.nix { };