ocamlPackages.conan: 0.0.6 → 0.0.7 (#495941)

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

@@ -2,7 +2,6 @@
   lib,
   fetchurl,
   buildDunePackage,
-  version ? "0.0.6",
   ptime,
   re,
   uutf,
@@ -12,13 +11,13 @@
   rresult,
 }:
 
-buildDunePackage {
+buildDunePackage (finalAttrs: {
   pname = "conan";
-  inherit version;
+  version = "0.0.7";
 
   src = fetchurl {
-    url = "https://github.com/mirage/conan/releases/download/v${version}/conan-${version}.tbz";
-    hash = "sha256-shAle4gXFf+53L+IZ4yFWewq7yZ5WlMEr9WotLvxHhY=";
+    url = "https://github.com/mirage/conan/releases/download/v${finalAttrs.version}/conan-${finalAttrs.version}.tbz";
+    hash = "sha256-4ZbyGLnPRImRQ8vO71i+jlEWYB/FJCSelY7uBuH4dBU=";
   };
 
   propagatedBuildInputs = [
@@ -44,4 +43,4 @@ buildDunePackage {
     license = lib.licenses.bsd2;
     maintainers = [ lib.maintainers.vbgl ];
   };
-}
+})

pkgs/development/ocaml-modules/conan/lwt.nix

@@ -2,7 +2,7 @@
   buildDunePackage,
   conan,
   lwt,
-  bigstringaf,
+  bstr,
   alcotest,
   crowbar,
   fmt,
@@ -16,7 +16,7 @@ buildDunePackage {
   propagatedBuildInputs = [
     conan
     lwt
-    bigstringaf
+    bstr
   ];
 
   doCheck = true;

pkgs/development/ocaml-modules/conan/unix.nix

@@ -1,7 +1,7 @@
 {
   buildDunePackage,
-  fetchpatch,
   conan,
+  cachet,
   alcotest,
   crowbar,
   fmt,
@@ -12,12 +12,8 @@ buildDunePackage {
   pname = "conan-unix";
   inherit (conan) version src meta;
 
-  patches = fetchpatch {
-    url = "https://github.com/mirage/conan/commit/16872a71be3ef2870d32df849e7abcbaec4fe95d.patch";
-    hash = "sha256-/j9nNGOklzNrdIPW7SMNhKln9EMXiXmvPmNRpXc/l/Y=";
-  };
-
   propagatedBuildInputs = [
+    cachet
     conan
   ];