Merge branch 'nixpkgs-update' into master

1 files changed, 15 insertions, 25 deletions

diff --git a/pkgs/development/ocaml-modules/safepass/default.nix b/pkgs/development/ocaml-modules/safepass/default.nix
index 884bcdebba4..e8a50f45119 100644
--- a/pkgs/development/ocaml-modules/safepass/default.nix
+++ b/pkgs/development/ocaml-modules/safepass/default.nix
@@ -1,33 +1,23 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild }:
+{ lib, fetchFromGitHub, buildDunePackage }:
 
-let param =
-  if stdenv.lib.versionAtLeast ocaml.version "4.02"
-  then {
-    version = "2.0";
-    url = "http://forge.ocamlcore.org/frs/download.php/1615/ocaml-safepass-2.0.tgz";
-    sha256 = "1zxx3wcyzhxxvm5w9c21y7hpa11h67paaaz9mfsyiqk6fs6hcvmw";
-  } else {
-    version = "1.3";
-    url = "http://forge.ocamlcore.org/frs/download.php/1432/ocaml-safepass-1.3.tgz";
-    sha256 = "0lb8xbpyc5d1zml7s7mmcr6y2ipwdp7qz73lkv9asy7dyi6cj15g";
-  };
-in
-
-stdenv.mkDerivation {
-  name = "ocaml${ocaml.version}-safepass-${param.version}";
-  src = fetchurl {
-    inherit (param) url sha256;
-  };
+buildDunePackage rec {
+  pname = "safepass";
+  version = "3.1";
 
-  buildInputs = [ ocaml findlib ocamlbuild ];
+  useDune2 = true;
 
-  createFindlibDestdir = true;
+  src = fetchFromGitHub {
+    owner = "darioteixeira";
+    repo = "ocaml-safepass";
+    rev = "v${version}";
+    sha256 = "1cwslwdb1774lfmhcclj9kymvidbcpjx1vp16jnjirqdqgl4zs5q";
+  };
 
   meta = {
-    homepage = "http://ocaml-safepass.forge.ocamlcore.org/";
+    inherit (src.meta) homepage;
     description = "An OCaml library offering facilities for the safe storage of user passwords";
-    license = stdenv.lib.licenses.lgpl21;
-    platforms = ocaml.meta.platforms or [];
-    maintainers = with stdenv.lib.maintainers; [ vbgl ];
+    license = lib.licenses.lgpl21;
+    maintainers = with lib.maintainers; [ vbgl ];
   };
+
 }