From fed5706e4ae825bd74111406ede7352d1a73df73 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Mon, 29 Nov 2021 19:06:17 +0100
Subject: [PATCH] =?UTF-8?q?ocamlPackages.ocsigen=5Fderiving:=200.8.1=20?=
 =?UTF-8?q?=E2=86=92=200.8.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ocsigen-deriving/default.nix              | 32 ++++++-------------
 1 file changed, 10 insertions(+), 22 deletions(-)

diff --git a/pkgs/development/ocaml-modules/ocsigen-deriving/default.nix b/pkgs/development/ocaml-modules/ocsigen-deriving/default.nix
index 9db6526dbaf7..d2e20838ecaf 100644
--- a/pkgs/development/ocaml-modules/ocsigen-deriving/default.nix
+++ b/pkgs/development/ocaml-modules/ocsigen-deriving/default.nix
@@ -5,46 +5,34 @@
 , findlib
 , ocamlbuild
 , oasis
-, ocaml_optcomp
 , camlp4
 , num
 }:
 
-let param =
-  if lib.versionAtLeast ocaml.version "4.03"
-  then {
-    version = "0.8.1";
-    sha256 = "03vzrybdpjydbpil97zmir71kpsn2yxkjnzysma7fvybk8ll4zh9";
-    buildInputs = [ num ];
-  } else {
-    version = "0.7.1";
-    sha256 = "0gg3nr3iic4rwqrcc0qvfm9x0x57zclvdsnpy0z8rv2fl5isbzms";
-  };
-in
+if !lib.versionAtLeast ocaml.version "4.03"
+then throw "ocsigen-deriving is not available of OCaml ${ocaml.version}"
+else
 
-let inherit (param) version; in
-
-stdenv.mkDerivation {
-  pname = "ocsigen-deriving";
-  inherit version;
+stdenv.mkDerivation rec {
+  pname = "ocaml${ocaml.version}-ocsigen-deriving";
+  version = "0.8.2";
 
   src = fetchFromGitHub {
     owner = "ocsigen";
     repo = "deriving";
     rev = version;
-    inherit (param) sha256;
+    sha256 = "sha256:09rp9mrr551na0nmclpxddlrkb6l2d7763xv14xfx467kff3z0wf";
   };
 
-  buildInputs = [ ocaml findlib ocamlbuild oasis ocaml_optcomp camlp4 ]
-    ++ (param.buildInputs or [ ]);
-
   createFindlibDestdir = true;
 
+  buildInputs = [ ocaml findlib ocamlbuild oasis camlp4 num ];
+
   meta = {
     homepage = "https://github.com/ocsigen/deriving";
     description = "Extension to OCaml for deriving functions from type declarations";
     license = lib.licenses.mit;
-    platforms = ocaml.meta.platforms or [ ];
+    inherit (ocaml.meta) platforms;
     maintainers = with lib.maintainers; [
       gal_bolle
       vbgl