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

Merge pull request #16025 from vbgl/utop-1.19

Browse Source 
utop: 1.17 -> 1.19.2
This commit is contained in:
obadz 2016-06-08 01:07:05 +01:00
commit 30f2dd5f55
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/development/ocaml-modules/lambda-term/default.nix
View File

@ -1,19 +1,19 @@
{ stdenv, fetchurl, libev, ocaml, findlib, ocaml_lwt, ocaml_react, zed, camlp4 }:
{ stdenv, fetchurl, libev, ocaml, findlib, ocaml_lwt, ocaml_react, zed }:
assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.01";
stdenv.mkDerivation rec {
version = "1.8";
version = "1.10";
name = "lambda-term-${version}";
src = fetchurl {
url = https://github.com/diml/lambda-term/archive/1.8.tar.gz;
sha256 = "0hy11x48q5bbh9czjp0w756cyxzr2c6qcnfm5n9f0i1l4qljwpgc";
url = "https://github.com/diml/lambda-term/archive/${version}.tar.gz";
sha256 = "1kwpsqds51xmy3z3ddkam92hkl7arlzy9awhzsq62ysxcl91fb8m";
};
buildInputs = [ libev ocaml findlib ocaml_react ];
propagatedBuildInputs = [ camlp4 zed ocaml_lwt ];
propagatedBuildInputs = [ zed ocaml_lwt ];
createFindlibDestdir = true;

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

@ -1,23 +1,24 @@
{stdenv, fetchurl, ocaml, findlib, lambdaTerm, ocaml_lwt, makeWrapper,
ocaml_react, camomile, zed, cppo, camlp4
ocaml_react, camomile, zed, cppo, camlp4, ppx_tools
}:
stdenv.mkDerivation rec {
version = "1.17";
version = "1.19.2";
name = "utop-${version}";
src = fetchurl {
url = "https://github.com/diml/utop/archive/${version}.tar.gz";
sha256 = "0l9lz2nypl2ls3kqzmp738m02yvscabhsfpj70ckp0p98pimnnfd";
sha256 = "0hxybkqmrh0sz1yyyrgzdmxp46gda4vk22pv07s0qpfg2dpv56jh";
};
buildInputs = [ ocaml findlib makeWrapper cppo camlp4 ];
buildInputs = [ ocaml findlib makeWrapper cppo camlp4 ppx_tools ];
propagatedBuildInputs = [ lambdaTerm ocaml_lwt ];
createFindlibDestdir = true;
configureFlags = "--enable-camlp4";
configureFlags = [ "--enable-camlp4" ]
++ stdenv.lib.optional (ppx_tools != null) "--enable-interact";
buildPhase = ''
make