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

Merge pull request #9028 from samuelrivas/update-utop-and-camlp4

Browse Source 
Update utop and camlp4
This commit is contained in:
vbgl 2015-08-06 09:11:34 +02:00
commit b8a1e16f81
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/development/tools/ocaml/camlp4/default.nix
View File

@ -1,15 +1,17 @@
{stdenv, fetchurl, which, ocaml}: {stdenv, fetchzip, which, ocaml}:
let let
ocaml_version = (stdenv.lib.getVersion ocaml); ocaml_version = (stdenv.lib.getVersion ocaml);
version = "4.02+6";
in in
assert stdenv.lib.versionAtLeast ocaml_version "4.02"; assert stdenv.lib.versionAtLeast ocaml_version "4.02";
stdenv.mkDerivation { stdenv.mkDerivation {
name = "camlp4-4.02.0+1"; name = "camlp4-${version}";
src = fetchurl { src = fetchzip {
url = https://github.com/ocaml/camlp4/archive/4.02.0+1.tar.gz; url = "https://github.com/ocaml/camlp4/archive/${version}.tar.gz";
sha256 = "0055f4jiz82rgn581xhq3mr4qgq2qgdxqppmp8i2x1xnsim4h9pn"; sha256 = "06yl4q0qazl7g25b0axd1gdkfd4qpqzs1gr5fkvmkrcbz113h1hj";
}; };
buildInputs = [ which ocaml ]; buildInputs = [ which ocaml ];
@ -27,10 +29,6 @@ stdenv.mkDerivation {
postConfigure = '' postConfigure = ''
substituteInPlace camlp4/META.in \ substituteInPlace camlp4/META.in \
--replace +camlp4 $out/lib/ocaml/${ocaml_version}/site-lib/camlp4 --replace +camlp4 $out/lib/ocaml/${ocaml_version}/site-lib/camlp4
substituteInPlace camlp4/config/Camlp4_config.ml \
--replace \
"Filename.concat ocaml_standard_library" \
"Filename.concat \"$out/lib/ocaml/${ocaml_version}/site-lib\""
''; '';

12
pkgs/development/tools/ocaml/utop/default.nix
View File

@ -1,22 +1,24 @@
{stdenv, fetchurl, ocaml, findlib, lambdaTerm, ocaml_lwt, makeWrapper, {stdenv, fetchurl, ocaml, findlib, lambdaTerm, ocaml_lwt, makeWrapper,
ocaml_react, camomile, zed ocaml_react, camomile, zed, cppo, camlp4
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "1.15"; version = "1.17";
name = "utop-${version}"; name = "utop-${version}";
src = fetchurl { src = fetchurl {
url = https://github.com/diml/utop/archive/1.15.tar.gz; url = "https://github.com/diml/utop/archive/${version}.tar.gz";
sha256 = "106v0x6sa2x10zgmjf73mpzws7xiqanxswivd00iqnpc0bcpkmrr"; sha256 = "0l9lz2nypl2ls3kqzmp738m02yvscabhsfpj70ckp0p98pimnnfd";
}; };
buildInputs = [ ocaml findlib makeWrapper]; buildInputs = [ ocaml findlib makeWrapper cppo camlp4 ];
propagatedBuildInputs = [ lambdaTerm ocaml_lwt ]; propagatedBuildInputs = [ lambdaTerm ocaml_lwt ];
createFindlibDestdir = true; createFindlibDestdir = true;
configureFlags = "--enable-camlp4";
buildPhase = '' buildPhase = ''
make make
make doc make doc