From a130228fe87c06a75f2f19343caea6905f611388 Mon Sep 17 00:00:00 2001 From: Sophia Donataccio Date: Fri, 12 Oct 2018 00:30:48 -0400 Subject: [PATCH] mlton: adds mlton version 20180207 --- pkgs/development/compilers/mlton/default.nix | 10 +++++- .../compilers/mlton/from-git-source.nix | 33 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 3 +- 3 files changed, 44 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/compilers/mlton/from-git-source.nix diff --git a/pkgs/development/compilers/mlton/default.nix b/pkgs/development/compilers/mlton/default.nix index a0662cd18a3..b32a817e20a 100644 --- a/pkgs/development/compilers/mlton/default.nix +++ b/pkgs/development/compilers/mlton/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchFromGitHub, patchelf, gmp }: +{ stdenv, fetchurl, fetchgit, patchelf, gmp }: rec { mlton20130715 = import ./20130715.nix { inherit stdenv fetchurl patchelf gmp; @@ -7,4 +7,12 @@ rec { mlton20180207Binary = import ./20180207-binary.nix { inherit stdenv fetchurl patchelf gmp; }; + + mlton20180207 = import ./from-git-source.nix { + mltonBootstrap = mlton20180207Binary; + version = "20180207"; + rev = "on-20180207-release"; + sha256 = "00rdd2di5x1dzac64il9z05m3fdzicjd3226wwjyynv631jj3q2a"; + inherit stdenv fetchgit gmp; + }; } diff --git a/pkgs/development/compilers/mlton/from-git-source.nix b/pkgs/development/compilers/mlton/from-git-source.nix new file mode 100644 index 00000000000..6678335b4b9 --- /dev/null +++ b/pkgs/development/compilers/mlton/from-git-source.nix @@ -0,0 +1,33 @@ +{ fetchgit +, gmp +, mltonBootstrap +, url ? "https://github.com/mlton/mlton" +, rev +, sha256 +, stdenv +, version +}: + +stdenv.mkDerivation { + name = "mlton-${version}"; + + src = fetchgit { + inherit url rev sha256; + }; + + buildInputs = [mltonBootstrap gmp]; + + preBuild = '' + makeFlagsArray=( + MLTON_VERSION="${version} ${rev}" + CC="$(type -p cc)" + PREFIX="$out" + WITH_GMP_INC_DIR="${gmp.dev}/include" + WITH_GMP_LIB_DIR="${gmp}/lib" + ) + ''; + + doCheck = true; + + meta = import ./meta.nix; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 539b84abd4e..a221c194a24 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7164,7 +7164,8 @@ with pkgs; inherit (callPackage ../development/compilers/mlton {}) mlton20130715 - mlton20180207Binary; + mlton20180207Binary + mlton20180207; mlton = mlton20130715;