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

Merge pull request #42734 from vbgl/ocaml-utop-2.1.0

Browse Source 
ocamlPackages.utop: 1.19.3 -> 2.1.0
This commit is contained in:
xeji 2018-06-29 00:34:11 +02:00 committed by GitHub
commit 5c757847eb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,10 +1,10 @@
{ stdenv, buildOcaml, fetchurl, libev, ocaml, findlib, jbuilder, zed, lwt_react }: { stdenv, fetchurl, libev, ocaml, findlib, jbuilder, zed, lwt_react }:
assert stdenv.lib.versionAtLeast ocaml.version "4.02"; assert stdenv.lib.versionAtLeast ocaml.version "4.02";
buildOcaml rec { stdenv.mkDerivation rec {
version = "1.12.0"; version = "1.12.0";
name = "lambda-term"; name = "ocaml${ocaml.version}-lambda-term-${version}";
src = fetchurl { src = fetchurl {
url = "https://github.com/diml/lambda-term/archive/${version}.tar.gz"; url = "https://github.com/diml/lambda-term/archive/${version}.tar.gz";

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

@ -1,5 +1,5 @@
{ stdenv, fetchurl, bash, ocaml, findlib, ocamlbuild, camlp4 { stdenv, fetchurl, bash, ocaml, findlib, ocamlbuild, jbuilder
, lambdaTerm, ocaml_lwt, camomile, zed, cppo, ppx_tools, makeWrapper , lambdaTerm, cppo, makeWrapper
}: }:
if !stdenv.lib.versionAtLeast ocaml.version "4.02" if !stdenv.lib.versionAtLeast ocaml.version "4.02"
@ -7,30 +7,20 @@ then throw "utop is not available for OCaml ${ocaml.version}"
else else
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "1.19.3"; version = "2.1.0";
name = "utop-${version}"; name = "utop-${version}";
src = fetchurl { src = fetchurl {
url = "https://github.com/diml/utop/archive/${version}.tar.gz"; url = "https://github.com/diml/utop/archive/${version}.tar.gz";
sha256 = "16z02vp9n97iax4fqpbi7v86r75vbabxvnd1rirh8w2miixs1g4x"; sha256 = "0lpfyhnm4v3xmcpac76g1px3x7na4p29w6xj2q8chqxhcw131n2y";
}; };
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
buildInputs = [ ocaml findlib ocamlbuild cppo camlp4 ppx_tools ]; buildInputs = [ ocaml findlib ocamlbuild cppo jbuilder ];
propagatedBuildInputs = [ lambdaTerm ocaml_lwt ]; propagatedBuildInputs = [ lambdaTerm ];
createFindlibDestdir = true; inherit (jbuilder) installPhase;
configureFlags = [ "--enable-camlp4" ]
++ stdenv.lib.optional (ppx_tools != null && !stdenv.lib.versionAtLeast ocaml.version "4.04") "--enable-interact";
buildPhase = ''
make
make doc
'';
dontStrip = true;
postFixup = postFixup =
let let