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

Merge pull request #32494 from mpickering/ber-metaocaml2

Browse Source 
ber_metaocaml: (re)init at 104
This commit is contained in:
Vincent Laporte 2017-12-10 12:36:30 +01:00 committed by GitHub
commit d98d944d5d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 34 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
pkgs/development/compilers/ocaml/ber-metaocaml-003.nix → pkgs/development/compilers/ocaml/ber-metaocaml-104.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, ncurses, xlibsWrapper }: { stdenv, fetchurl, ncurses, libX11, xproto, buildEnv }:
let let
useX11 = stdenv.isi686 || stdenv.isx86_64; useX11 = stdenv.isi686 || stdenv.isx86_64;
@ -7,52 +7,65 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "ber-metaocaml-${version}"; name = "ber-metaocaml-${version}";
version = "003"; version = "104";
src = fetchurl { src = fetchurl {
url = "http://caml.inria.fr/pub/distrib/ocaml-3.11/ocaml-3.11.2.tar.bz2"; url = "http://caml.inria.fr/pub/distrib/ocaml-4.04/ocaml-4.04.0.tar.gz";
sha256 = "0hw1yp1mmfyn1pmda232d0ry69m7ln1z0fn5lgi8nz3y1mx3iww6"; sha256 = "1pi2hdm9lxhn45qvfqfss1hpa4jijm14qgmrgajsadxqdiplhqyb";
}; };
metaocaml = fetchurl { metaocaml = fetchurl {
url = "http://okmij.org/ftp/ML/ber-metaocaml.tar.gz"; url = "http://okmij.org/ftp/ML/ber-metaocaml-104.tar.gz";
sha256 = "1kq1if25c1wvcdiy4g46xk05dkc1am2gc4qvmg4x19wvvaz09gzf"; sha256 = "1gmwlxairxqcmqa2r6kbf8b4dxc7pfhfbh48g1s14d3z20rj8nib";
}; };
# Needed to avoid a SIGBUS on the final executable on mips # Needed to avoid a SIGBUS on the final executable on mips
NIX_CFLAGS_COMPILE = if stdenv.isMips then "-fPIC" else ""; NIX_CFLAGS_COMPILE = if stdenv.isMips then "-fPIC" else "";
patches = optionals stdenv.isDarwin [ ./gnused-on-osx-fix.patch ]; x11env = buildEnv { name = "x11env"; paths = [libX11 xproto];};
x11lib = x11env + "/lib";
x11inc = x11env + "/include";
prefixKey = "-prefix "; prefixKey = "-prefix ";
configureFlags = ["-no-tk"] ++ optionals useX11 [ "-x11lib" xlibsWrapper ]; configureFlags = optionals useX11 [ "-x11lib" x11lib
buildFlags = "core coreboot all"; # "world" + optionalString useNativeCompilers " bootstrap world.opt"; "-x11include" x11inc ];
buildInputs = [ncurses] ++ optionals useX11 [ xlibsWrapper ];
dontStrip = true;
buildInputs = [ncurses] ++ optionals useX11 [ libX11 xproto ];
installFlags = "-i"; installFlags = "-i";
installTargets = "install"; # + optionalString useNativeCompilers " installopt"; installTargets = "install"; # + optionalString useNativeCompilers " installopt";
prePatch = ''
CAT=$(type -tp cat)
sed -e "s@/bin/cat@$CAT@" -i config/auto-aux/sharpbang
patch -p0 < ${./mips64.patch}
'';
postConfigure = '' postConfigure = ''
tar -xvzf $metaocaml tar -xvzf $metaocaml
cd ${name} cd ${name}
make patch make patch
cd .. cd ..
''; '';
postBuild = '' buildPhase = ''
make world
make -i install
make bootstrap
make opt.opt
make installopt
mkdir -p $out/include mkdir -p $out/include
ln -sv $out/lib/ocaml/caml $out/include/caml ln -sv $out/lib/ocaml/caml $out/include/caml
'';
postInstall = ''
cd ${name} cd ${name}
make all make all
make install make install
make install.opt
cd ..
'';
installPhase = "";
postBuild = ''
'';
checkPhase = ''
cd ${name}
make test make test
make test-compile make test-compile
make test-native
cd .. cd ..
''; '';
@ -67,6 +80,5 @@ stdenv.mkDerivation rec {
A conservative extension of OCaml with the primitive type of code values, A conservative extension of OCaml with the primitive type of code values,
and three basic multi-stage expression forms: Brackets, Escape, and Run and three basic multi-stage expression forms: Brackets, Escape, and Run
''; '';
broken = true;
}; };
} }

2
pkgs/top-level/all-packages.nix
View File

@ -6264,7 +6264,7 @@ with pkgs;
metaocaml_3_09 = callPackage ../development/compilers/ocaml/metaocaml-3.09.nix { }; metaocaml_3_09 = callPackage ../development/compilers/ocaml/metaocaml-3.09.nix { };
ber_metaocaml_003 = callPackage ../development/compilers/ocaml/ber-metaocaml-003.nix { }; ber_metaocaml = callPackage ../development/compilers/ocaml/ber-metaocaml-104.nix { };
ocaml_make = callPackage ../development/ocaml-modules/ocamlmake { }; ocaml_make = callPackage ../development/ocaml-modules/ocamlmake { };