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;