diff --git a/pkgs/development/compilers/ponyc/pony-corral.nix b/pkgs/by-name/po/pony-corral/package.nix similarity index 100% rename from pkgs/development/compilers/ponyc/pony-corral.nix rename to pkgs/by-name/po/pony-corral/package.nix diff --git a/pkgs/development/compilers/ponyc/disable-networking-tests.patch b/pkgs/by-name/po/ponyc/disable-networking-tests.patch similarity index 100% rename from pkgs/development/compilers/ponyc/disable-networking-tests.patch rename to pkgs/by-name/po/ponyc/disable-networking-tests.patch diff --git a/pkgs/development/compilers/ponyc/fix-darwin-build.patch b/pkgs/by-name/po/ponyc/fix-darwin-build.patch similarity index 100% rename from pkgs/development/compilers/ponyc/fix-darwin-build.patch rename to pkgs/by-name/po/ponyc/fix-darwin-build.patch diff --git a/pkgs/development/compilers/ponyc/default.nix b/pkgs/by-name/po/ponyc/package.nix similarity index 90% rename from pkgs/development/compilers/ponyc/default.nix rename to pkgs/by-name/po/ponyc/package.nix index a78cd863dabd..b290f5c69bb4 100644 --- a/pkgs/development/compilers/ponyc/default.nix +++ b/pkgs/by-name/po/ponyc/package.nix @@ -22,30 +22,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 +91,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 8b0d8c752c50..d5f7158bc764 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6802,13 +6802,6 @@ 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; - }; - - pony-corral = callPackage ../development/compilers/ponyc/pony-corral.nix { }; - replibyte = callPackage ../development/tools/database/replibyte { inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; };