diff --git a/pkgs/by-name/hm/hmcl/0001-nix-use-terracotta-from-nix.patch b/pkgs/by-name/hm/hmcl/0001-nix-use-terracotta-from-nix.patch index 8bb7103962d6..272089641ce1 100644 --- a/pkgs/by-name/hm/hmcl/0001-nix-use-terracotta-from-nix.patch +++ b/pkgs/by-name/hm/hmcl/0001-nix-use-terracotta-from-nix.patch @@ -4,14 +4,14 @@ Date: Wed, 4 Feb 2026 15:36:17 +0800 Subject: [PATCH 1/2] nix: use terracotta from nix --- - .../hmcl/terracotta/TerracottaBundle.java | 21 +++---------------- - 1 file changed, 3 insertions(+), 18 deletions(-) + .../hmcl/terracotta/TerracottaBundle.java | 19 ++----------------- + 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/terracotta/TerracottaBundle.java b/HMCL/src/main/java/org/jackhuang/hmcl/terracotta/TerracottaBundle.java -index 727edde9b..5b6e8b02f 100644 +index ecc99f3..b46ada0 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/terracotta/TerracottaBundle.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/terracotta/TerracottaBundle.java -@@ -139,26 +139,11 @@ public final class TerracottaBundle { +@@ -147,26 +147,11 @@ public final class TerracottaBundle { } public Path locate(String file) { @@ -33,20 +33,13 @@ index 727edde9b..5b6e8b02f 100644 - return AbstractTerracottaProvider.Status.LEGACY_VERSION; - } - } catch (IOException e) { -- Logger.LOG.warning("Cannot determine whether legacy versions exist.", e); +- LOG.warning("Cannot determine whether legacy versions exist.", e); - } - return AbstractTerracottaProvider.Status.NOT_EXIST; + return AbstractTerracottaProvider.Status.READY; } private boolean isLocalBundleValid() throws IOException { // FIXME: Make control flow clearer. -@@ -188,4 +173,4 @@ public final class TerracottaBundle { - } - return true; - } --} -+} -\ No newline at end of file -- 2.52.0 diff --git a/pkgs/by-name/hm/hmcl/package.nix b/pkgs/by-name/hm/hmcl/package.nix index 9068be750cf3..f8d668e037a6 100644 --- a/pkgs/by-name/hm/hmcl/package.nix +++ b/pkgs/by-name/hm/hmcl/package.nix @@ -50,13 +50,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "hmcl"; - version = "3.15.3"; + version = "3.16.2"; src = fetchurl { # HMCL has built-in keys, such as the Microsoft OAuth secret and the CurseForge API key. # See https://github.com/HMCL-dev/HMCL/blob/refs/tags/release-3.6.12/.github/workflows/gradle.yml#L26-L28 url = "https://github.com/HMCL-dev/HMCL/releases/download/v${finalAttrs.version}/HMCL-${finalAttrs.version}.jar"; - hash = "sha256-/7RLhSHCnxtKxmusjnrfUEweYXzOoKcQO3G9+loBofk="; + hash = "sha256-kvQDDZwA2sy8UQLZG4FqGmSh0sDcEuSg5CM6uy0DzCc="; }; # - HMCL prompts users to download prebuilt Terracotta binary for @@ -71,12 +71,12 @@ stdenv.mkDerivation (finalAttrs: { terracottaBundleJava = fetchurl { name = "hmcl-terracotta-bundle-java-${finalAttrs.version}"; url = "https://raw.githubusercontent.com/HMCL-dev/HMCL/v${finalAttrs.version}/${finalAttrs.terracottaBundleJavaPath}"; - hash = "sha256-1o/CUDeywtDlhAxqInk77aUwGCCYeZ84VMIyouN49uU="; + hash = "sha256-dZHRim/7VNW0/nA6I8r3t5zGfzIMxG2lzdZ//dzv2Gs="; }; macOSProviderJava = fetchurl { name = "hmcl-macos-provider-java-${finalAttrs.version}"; url = "https://raw.githubusercontent.com/HMCL-dev/HMCL/v${finalAttrs.version}/${finalAttrs.macOSProviderJavaPath}"; - hash = "sha256-+Zji2B8ksT7P+IObyrM9q7vHPJVl5ZtH+v/J8Mfr0Q4="; + hash = "sha256-7vI2U8vx3GYwlshoHJF/J8n2RS6TZ/cvoAivqYtW23Q="; }; terracottaBundleJavaPath = "HMCL/src/main/java/org/jackhuang/hmcl/terracotta/TerracottaBundle.java"; macOSProviderJavaPath = "HMCL/src/main/java/org/jackhuang/hmcl/terracotta/provider/MacOSProvider.java";