about summary refs log tree commit diff
path: root/pkgs/development/ocaml-modules/camlzip
diff options
context:
space:
mode:
authorVincent Laporte <Vincent.Laporte@gmail.com>2022-11-30 10:16:42 +0100
committerVincent Laporte <vbgl@users.noreply.github.com>2022-12-07 11:19:12 +0100
commit9cc7f80dea4cde202c1ee514532b53953b1f3510 (patch)
treeffb46043682d0557c4c45aa226e106d803a53de8 /pkgs/development/ocaml-modules/camlzip
parente288403397e78d694e2178ff047e69190c96da80 (diff)
ocamlPackages.camlzip: 1.10 → 1.11
Diffstat (limited to 'pkgs/development/ocaml-modules/camlzip')
-rw-r--r--pkgs/development/ocaml-modules/camlzip/default.nix21
1 files changed, 14 insertions, 7 deletions
diff --git a/pkgs/development/ocaml-modules/camlzip/default.nix b/pkgs/development/ocaml-modules/camlzip/default.nix
index caf3e7a63f0dd..761453739e29a 100644
--- a/pkgs/development/ocaml-modules/camlzip/default.nix
+++ b/pkgs/development/ocaml-modules/camlzip/default.nix
@@ -1,17 +1,24 @@
 {lib, stdenv, fetchurl, zlib, ocaml, findlib}:
 
 let
-  param =
-    if lib.versionAtLeast ocaml.version "4.02"
-    then {
-      version = "1.10";
-      url = "https://github.com/xavierleroy/camlzip/archive/rel110.tar.gz";
-      sha256 = "X0YcczaQ3lFeJEiTIgjSSZ1zi32KFMtmZsP0FFpyfbI=";
+  common = {
       patches = [];
       postPatchInit = ''
         cp META-zip META-camlzip
         echo 'directory="../zip"' >> META-camlzip
       '';
+  };
+  param =
+    if lib.versionAtLeast ocaml.version "4.07"
+    then common // {
+      version = "1.11";
+      url = "https://github.com/xavierleroy/camlzip/archive/rel111.tar.gz";
+      sha256 = "sha256-/7vF3j4cE9wOWScjdtIy0u3pGzJ1UQY9R/3bdPHV7Tc=";
+    } else if lib.versionAtLeast ocaml.version "4.02"
+    then common // {
+      version = "1.10";
+      url = "https://github.com/xavierleroy/camlzip/archive/rel110.tar.gz";
+      sha256 = "X0YcczaQ3lFeJEiTIgjSSZ1zi32KFMtmZsP0FFpyfbI=";
     } else {
       version = "1.05";
       download_id = "1037";
@@ -25,7 +32,7 @@ let
 in
 
 stdenv.mkDerivation {
-  pname = "camlzip";
+  pname = "ocaml${ocaml.version}-camlzip";
   version = param.version;
 
   src = fetchurl {