Merge staging-next into staging

2019-08-31 10:04:20 +02:00
parent ebe4fd146b fc74ba8291
commit ad1d58c622
364 changed files with 8970 additions and 6854 deletions
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, dune
+{ stdenv, fetchurl, ocaml, findlib, dune
 , lambdaTerm, cppo, makeWrapper
 }:

@@ -7,16 +7,16 @@ then throw "utop is not available for OCaml ${ocaml.version}"
 else

 stdenv.mkDerivation rec {
-  version = "2.3.0";
  pname = "utop";
+  version = "2.4.1";

  src = fetchurl {
    url = "https://github.com/diml/utop/archive/${version}.tar.gz";
-    sha256 = "1g1xf19fhzwsikp33pv1wf6wb2qdc5y7dzqi46h8c4l850cwscjh";
+    sha256 = "0kbg7sfn7jaic7xcy7dm543yzsywirxbgpiv2rzwnp9ny2510f9g";
  };

  nativeBuildInputs = [ makeWrapper ];
-  buildInputs = [ ocaml findlib ocamlbuild cppo dune ];
+  buildInputs = [ ocaml findlib cppo dune ];

  propagatedBuildInputs = [ lambdaTerm ];