ocamlPackages.ff: 0.4.0 → 0.6.2

ocamlPackages.ff-pbt: 0.6.1 → 0.6.2
ocamlPackages.ff-sig: 0.6.1 → 0.6.2

pkgs/development/ocaml-modules/ff/default.nix

···
-{ lib, fetchFromGitLab, buildDunePackage, ocaml, zarith, alcotest }:
+{ lib, buildDunePackage, ff-pbt, ff-sig, zarith, alcotest }:
 
 buildDunePackage rec {
   pname = "ff";
-  version = "0.4.0";
-
-  src = fetchFromGitLab {
-    owner = "dannywillems";
-    repo = "ocaml-ff";
-    rev = version;
-    sha256 = "1ik29srzkd0pl48p1si9p1c4f8vmx5rgm02yv2arj3vg0a1nfhdv";
-  };
-
-  useDune2 = true;
+  inherit (ff-sig) version src;
 
   propagatedBuildInputs = [
+    ff-sig
     zarith
   ];
 
   checkInputs = [
     alcotest
+    ff-pbt
   ];
 
-  doCheck = lib.versionAtLeast ocaml.version "4.08";
+  doCheck = true;
 
-  meta = {
-    homepage = "https://gitlab.com/dannywillems/ocaml-ff";
+  meta = ff-sig.meta // {
     description = "OCaml implementation of Finite Field operations";
-    license = lib.licenses.mit;
-    maintainers = [ lib.maintainers.ulrikstrid ];
   };
 }

pkgs/development/ocaml-modules/ff/pbt.nix

···
-{ lib, fetchFromGitLab, buildDunePackage, zarith, ff-sig, alcotest }:
+{ lib, buildDunePackage, zarith, ff-sig, alcotest }:
 
 buildDunePackage {
   pname = "ff-pbt";
-  inherit (ff-sig) version src doCheck useDune2;
+  inherit (ff-sig) version src;
 
   minimalOCamlVersion = "4.08";
 
   checkInputs = [
     alcotest
   ];
+
+  doCheck = true;
 
   propagatedBuildInputs = [
     zarith

pkgs/development/ocaml-modules/ff/sig.nix

···
 
 buildDunePackage rec {
   pname = "ff-sig";
-  version = "0.6.1";
+  version = "0.6.2";
   src = fetchFromGitLab {
-    owner = "dannywillems";
-    repo = "ocaml-ff";
+    owner = "nomadic-labs";
+    repo = "cryptography/ocaml-ff";
     rev = version;
-    sha256 = "0p42ivyfbn1pwm18773y4ga9cm64ysha0rplzvrnhszg01anarc0";
+    sha256 = "sha256-IoUH4awMOa1pm/t8E5io87R0TZsAxJjGWaXhXjn/w+Y=";
   };
-
-  useDune2 = true;
 
   propagatedBuildInputs = [
     zarith
···
   doCheck = true;
 
   meta = {
-    homepage = "https://gitlab.com/dannywillems/ocaml-ff";
+    inherit (src.meta) homepage;
     description = "Minimal finite field signatures";
     license = lib.licenses.mit;
     maintainers = [ lib.maintainers.ulrikstrid ];