Unverified Commit e89cf1c9 authored by Pol Dellaiera's avatar Pol Dellaiera Committed by GitHub
Browse files

Merge pull request #300406 from agoode/fix-mlton 

mlton: 20210107 -> 20210117
parents 298edc8f 318fba18

pkgs/development/compilers/mlton/20210107-binary.nix→pkgs/development/compilers/mlton/20210117-binary.nix

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ let 
in

stdenv.mkDerivation rec {

  pname = "mlton";

  version = "20210107";

  version = "20210117";



  src =

    if stdenv.hostPlatform.system == "x86_64-linux" then

pkgs/development/compilers/mlton/default.nix

+3 −3
Original line number Diff line number Diff line
@@ -12,11 +12,11 @@ rec { 
    sha256 = "00rdd2di5x1dzac64il9z05m3fdzicjd3226wwjyynv631jj3q2a";

  };



  mlton20210107Binary = callPackage ./20210107-binary.nix { };

  mlton20210117Binary = callPackage ./20210117-binary.nix { };



  mlton20210107 = callPackage ./from-git-source.nix {

  mlton20210117 = callPackage ./from-git-source.nix {

    mltonBootstrap = mlton20180207Binary;

    version = "20210107";

    version = "20210117";

    rev = "on-20210117-release";

    sha256 = "sha256-rqL8lnzVVR+5Hc7sWXK8dCXN92dU76qSoii3/4StODM=";

  };

pkgs/top-level/aliases.nix

+1 −0
Original line number Diff line number Diff line
@@ -781,6 +781,7 @@ mapAliases ({ 
  minetestserver_5 = minetestserver; # Added 2023-12-11

  minizip2 = pkgs.minizip-ng; # Added 2022-12-28

  mirage-im = throw "'mirage-im' has been removed, as it was broken and unmaintained"; # Added 2023-11-26

  mlton20210107 = throw "'mlton20210107' has been renamed to 'mlton20210117', correcting the version number"; # Added 2024-03-31

  mod_dnssd = apacheHttpdPackages.mod_dnssd; # Added 2014-11-07

  mod_fastcgi = apacheHttpdPackages.mod_fastcgi; # Added 2014-11-07

  mod_python = apacheHttpdPackages.mod_python; # Added 2014-11-07

pkgs/top-level/all-packages.nix

+2 −2
Original line number Diff line number Diff line
@@ -16558,10 +16558,10 @@ with pkgs; 
    mlton20130715

    mlton20180207Binary

    mlton20180207

    mlton20210107

    mlton20210117

    mltonHEAD;













  mlton = mlton20210107;













  mlton = mlton20210117;





























  mono = mono6;