Merge branch 'nixpkgs-update' into master

1 files changed, 13 insertions, 27 deletions

diff --git a/pkgs/development/ocaml-modules/cryptokit/default.nix b/pkgs/development/ocaml-modules/cryptokit/default.nix
index 69f8445e217..272ff72d8c5 100644
--- a/pkgs/development/ocaml-modules/cryptokit/default.nix
+++ b/pkgs/development/ocaml-modules/cryptokit/default.nix
@@ -1,43 +1,29 @@
-{ stdenv, fetchurl, zlib, ocaml, findlib, ocamlbuild, zarith, ncurses }:
+{ lib, buildDunePackage, fetchurl, zlib, dune-configurator, zarith, ncurses }:
 
-assert stdenv.lib.versionAtLeast ocaml.version "3.12";
-
-let param =
-  if stdenv.lib.versionAtLeast ocaml.version "4.02"
-  then {
-    version = "1.14";
-    url = "https://github.com/xavierleroy/cryptokit/archive/release114.tar.gz";
-    sha256 = "0wkh72idkb7dahiwyl94hhbq27cc7x9fnmxkpnbqli6wi8wd7d05";
-    inherit zarith;
-  } else {
-    version = "1.10";
-    url = "http://forge.ocamlcore.org/frs/download.php/1493/cryptokit-1.10.tar.gz";
-    sha256 = "1k2f2ixm7jcsgrzn9lz1hm9qqgq71lk9lxy3v3cwsd8xdrj3jrnv";
-    zarith = null;
-  };
-in
-
-stdenv.mkDerivation {
+buildDunePackage {
   pname = "cryptokit";
-  inherit (param) version;
+  version = "1.16.1";
+
+  useDune2 = true;
 
   src = fetchurl {
-    inherit (param) url sha256;
+    url = "https://github.com/xavierleroy/cryptokit/archive/release1161.tar.gz";
+    sha256 = "0kzqkk451m69nqi5qiwak0rd0rp5vzi613gcngsiig7dyxwka61c";
   };
 
-  buildInputs = [ ocaml findlib ocamlbuild ncurses ];
-  propagatedBuildInputs = [ param.zarith zlib ];
+  dontConfigure = true;
 
-  buildFlags = [ "setup.data" "build" ];
+  buildInputs = [ dune-configurator ncurses ];
+  propagatedBuildInputs = [ zarith zlib ];
 
-  preBuild = "mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib/stublibs";
+  doCheck = true;
 
   meta = {
     homepage = "http://pauillac.inria.fr/~xleroy/software.html";
     description = "A library of cryptographic primitives for OCaml";
-    platforms = ocaml.meta.platforms or [];
+    license = lib.licenses.lgpl2Only;
     maintainers = [
-      stdenv.lib.maintainers.maggesi
+      lib.maintainers.maggesi
     ];
   };
 }