public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ber_metaocaml: cleanup, tweaks

Browse Source 
This puts MetaOCaml on more equal footing with the normal OCaml
packages, which have a few passthru's and expect to have more 'meta'
information available (such as 'platforms').

With these changes, you can use the ber_metaocaml package along with
ocaml-ng.mkOcamlPackages in order to create a full package set with
Native MetaOCaml support, though this currently isn't implemented (you
have to do this yourself).

There are also other light cleanups, for example this also removes the
old MIPS support and restricts the platforms to x86 Linux/Darwin, for
now. Other platforms can be added on a case-by-case basis.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
This commit is contained in:
Austin Seipp 2018-12-14 09:41:51 -06:00
parent 8dd2fb2ffb
commit 3e6abb633c
1 changed files with 40 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
pkgs/development/compilers/ocaml/ber-metaocaml.nix
View File

@ -1,17 +1,24 @@
{ stdenv, fetchurl, ncurses, libX11, xproto, buildEnv }: { stdenv, fetchurl
, ncurses
, libX11, xproto, buildEnv
}:
let let
useX11 = stdenv.isi686 || stdenv.isx86_64; useX11 = stdenv.isi686 || stdenv.isx86_64;
x11deps = [ libX11 xproto ];
inherit (stdenv.lib) optionals; inherit (stdenv.lib) optionals;
baseOcamlBranch = "4.07";
baseOcamlVersion = "${baseOcamlBranch}.1";
metaocamlPatch = "107";
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "ber-metaocaml-${version}"; name = "ber-metaocaml-${version}";
version = "107"; version = metaocamlPatch;
src = fetchurl { src = fetchurl {
url = "https://caml.inria.fr/pub/distrib/ocaml-4.07/ocaml-4.07.1.tar.gz"; url = "https://caml.inria.fr/pub/distrib/ocaml-${baseOcamlBranch}/ocaml-${baseOcamlVersion}.tar.gz";
sha256 = "1x4sln131mcspisr22qc304590rvg720rbl7g2i4xiymgvhkpm1a"; sha256 = "1x4sln131mcspisr22qc304590rvg720rbl7g2i4xiymgvhkpm1a";
}; };
@ -20,21 +27,19 @@ stdenv.mkDerivation rec {
sha256 = "0xy6n0yj1f53pk612zfmn49pn04bd75qa40xgmr0w0lzx6dqsfmm"; sha256 = "0xy6n0yj1f53pk612zfmn49pn04bd75qa40xgmr0w0lzx6dqsfmm";
}; };
# Needed to avoid a SIGBUS on the final executable on mips x11env = buildEnv { name = "x11env"; paths = x11deps; };
NIX_CFLAGS_COMPILE = if stdenv.isMips then "-fPIC" else ""; x11lib = "${x11env}/lib";
x11inc = "${x11env}/include";
x11env = buildEnv { name = "x11env"; paths = [libX11 xproto];};
x11lib = x11env + "/lib";
x11inc = x11env + "/include";
prefixKey = "-prefix "; prefixKey = "-prefix ";
configureFlags = optionals useX11 [ "-x11lib" x11lib configureFlags = optionals useX11
"-x11include" x11inc ]; [ "-x11lib" x11lib
"-x11include" x11inc
"-flambda"
];
dontStrip = true; dontStrip = true;
buildInputs = [ncurses] ++ optionals useX11 [ libX11 xproto ]; buildInputs = [ ncurses ] ++ optionals useX11 x11deps;
installFlags = "-i";
installTargets = "install"; # + optionalString useNativeCompilers " installopt";
postConfigure = '' postConfigure = ''
tar -xvzf $metaocaml tar -xvzf $metaocaml
@ -42,6 +47,7 @@ stdenv.mkDerivation rec {
make patch make patch
cd .. cd ..
''; '';
buildPhase = '' buildPhase = ''
make world make world
make -i install make -i install
@ -53,13 +59,13 @@ stdenv.mkDerivation rec {
ln -sv $out/lib/ocaml/caml $out/include/caml ln -sv $out/lib/ocaml/caml $out/include/caml
cd ${name} cd ${name}
make all make all
'';
installPhase = ''
make install make install
make install.opt make install.opt
cd ..
'';
installPhase = "";
postBuild = ''
''; '';
checkPhase = '' checkPhase = ''
cd ${name} cd ${name}
make test make test
@ -68,16 +74,23 @@ stdenv.mkDerivation rec {
cd .. cd ..
''; '';
passthru = {
nativeCompilers = true;
};
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = "http://okmij.org/ftp/ML/index.html#ber-metaocaml"; description = "Multi-Stage Programming extension for OCaml";
license = with licenses; [ homepage = http://okmij.org/ftp/ML/MetaOCaml.html;
qpl /* compiler */ license = with licenses; [ /* compiler */ qpl /* library */ lgpl2 ];
lgpl2 /* library */ maintainers = with maintainers; [ thoughtpolice ];
];
description = "Conservative extension of OCaml"; branch = baseOcamlBranch;
platforms = with platforms; linux ++ darwin;
broken = stdenv.isAarch64 || stdenv.isMips;
longDescription = '' longDescription = ''
A conservative extension of OCaml with the primitive type of code values, A simple extension of OCaml with the primitive type of code values, and
and three basic multi-stage expression forms: Brackets, Escape, and Run three basic multi-stage expression forms: Brackets, Escape, and Run.
''; '';
}; };
} }