From 44ff5e3ce636206c84c5ff2cbad618754afa24dd Mon Sep 17 00:00:00 2001 From: Victor Freire Date: Mon, 15 Dec 2025 16:59:55 -0300 Subject: [PATCH 1/2] mlton: mlton20210117 -> mlton20241230 --- pkgs/development/compilers/mlton/default.nix | 11 ++++++++++- pkgs/development/compilers/mlton/from-git-source.nix | 5 ++--- pkgs/top-level/all-packages.nix | 3 ++- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/pkgs/development/compilers/mlton/default.nix b/pkgs/development/compilers/mlton/default.nix index a74d1d85455b..cc6559f07916 100644 --- a/pkgs/development/compilers/mlton/default.nix +++ b/pkgs/development/compilers/mlton/default.nix @@ -1,4 +1,4 @@ -{ callPackage }: +{ callPackage, stdenv }: rec { mlton20130715 = callPackage ./20130715.nix { }; @@ -21,6 +21,15 @@ rec { sha256 = "sha256-rqL8lnzVVR+5Hc7sWXK8dCXN92dU76qSoii3/4StODM="; }; + mlton20241230 = callPackage ./from-git-source.nix { + mltonBootstrap = mlton20210117Binary; + version = "20241230"; + rev = "on-20241230-release"; + sha256 = "sha256-gJUzav2xH8C4Vy5FuqN73Z6lPMSPQgJApF8LgsJXRWo="; + # https://github.com/MLton/mlton/issues/631 + doCheck = !(stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isDarwin); + }; + mltonHEAD = callPackage ./from-git-source.nix { mltonBootstrap = mlton20210117Binary; version = "HEAD"; diff --git a/pkgs/development/compilers/mlton/from-git-source.nix b/pkgs/development/compilers/mlton/from-git-source.nix index 91735196c1c7..a8e7c61f5334 100644 --- a/pkgs/development/compilers/mlton/from-git-source.nix +++ b/pkgs/development/compilers/mlton/from-git-source.nix @@ -9,11 +9,12 @@ stdenv, version, which, + doCheck ? true, }: stdenv.mkDerivation { pname = "mlton"; - inherit version; + inherit version doCheck; src = fetchgit { inherit url rev sha256; @@ -44,7 +45,5 @@ stdenv.mkDerivation { ) ''; - doCheck = true; - meta = import ./meta.nix { inherit lib; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 48dc7cff6d71..77b7a7ae9df6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5011,10 +5011,11 @@ with pkgs; mlton20180207Binary mlton20180207 mlton20210117 + mlton20241230 mltonHEAD ; - mlton = mlton20210117; + mlton = mlton20241230; mono = mono6; From 362f9770d9c3338bb9183d5eba2bfa49d336d5bf Mon Sep 17 00:00:00 2001 From: Victor Freire Date: Mon, 15 Dec 2025 17:00:34 -0300 Subject: [PATCH 2/2] mltonHEAD: 875f7912a0b135a9a7e86a04ecac9cacf0bfe5e5 -> 61baac7108fbd91413f0537b7a42d9a1023455f4 --- pkgs/development/compilers/mlton/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/mlton/default.nix b/pkgs/development/compilers/mlton/default.nix index cc6559f07916..91d70e431ff3 100644 --- a/pkgs/development/compilers/mlton/default.nix +++ b/pkgs/development/compilers/mlton/default.nix @@ -33,7 +33,9 @@ rec { mltonHEAD = callPackage ./from-git-source.nix { mltonBootstrap = mlton20210117Binary; version = "HEAD"; - rev = "875f7912a0b135a9a7e86a04ecac9cacf0bfe5e5"; - sha256 = "sha256-/MIoVqqv8qrJPehU7VRFpXtAAo8UUzE3waEvB7WnS9A="; + rev = "61baac7108fbd91413f0537b7a42d9a1023455f4"; + sha256 = "sha256-nWR7ZaXfKxeXfZ9IHipAQ39ASVtva4BeDHP3Zq8mqPo="; + # https://github.com/MLton/mlton/issues/631 + doCheck = !(stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isDarwin); }; }