ocamlPackages.ocaml-sat-solvers: 0.4 → 0.8 (#446112)

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

@@ -1,10 +1,11 @@
 {
   lib,
+  stdenv,
   buildDunePackage,
   fetchFromGitHub,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "minisat";
   version = "0.6";
 
@@ -13,14 +14,18 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "c-cube";
     repo = "ocaml-minisat";
-    rev = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-dH0Ndlyo/DTZ6Ao1S478aBuxoZFSkRBi5HblkTWCPas=";
   };
 
+  env = lib.optionalAttrs stdenv.hostPlatform.isDarwin {
+    NIX_CFLAGS_COMPILE = "-I${lib.getInclude stdenv.cc.libcxx}/include/c++/v1";
+  };
+
   meta = {
     homepage = "https://c-cube.github.io/ocaml-minisat/";
     description = "Simple bindings to Minisat-C";
     license = lib.licenses.bsd2;
     maintainers = with lib.maintainers; [ mgttlinger ];
   };
-}
+})

pkgs/development/ocaml-modules/ocaml-sat-solvers/default.nix

@@ -1,21 +1,19 @@
 {
   lib,
-  fetchFromGitHub,
-  buildOasisPackage,
+  fetchurl,
+  buildDunePackage,
   minisat,
 }:
 
-buildOasisPackage rec {
+buildDunePackage (finalAttrs: {
   pname = "ocaml-sat-solvers";
-  version = "0.4";
+  version = "0.8";
 
-  minimumOCamlVersion = "4.03.0";
+  minimalOCamlVersion = "4.05";
 
-  src = fetchFromGitHub {
-    owner = "tcsprojects";
-    repo = "ocaml-sat-solvers";
-    rev = "v${version}";
-    sha256 = "1hxr16cyl1p1k1cik848mqrysq95wxmlykpm93a99pn55mp28938";
+  src = fetchurl {
+    url = "https://github.com/tcsprojects/ocaml-sat-solvers/releases/download/v${finalAttrs.version}/ocaml-sat-solvers-${finalAttrs.version}.tbz";
+    hash = "sha256-1eXzuY6rrrjdEG/XnkJe4o9zAcUvfTVFO1+ZIzcgpOU=";
   };
 
   propagatedBuildInputs = [ minisat ];
@@ -26,4 +24,4 @@ buildOasisPackage rec {
     license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ mgttlinger ];
   };
-}
+})

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

@@ -1,6 +1,7 @@
 {
   lib,
   fetchFromGitHub,
+  fetchpatch,
   buildOasisPackage,
   ounit,
   tcslib,
@@ -18,6 +19,16 @@ buildOasisPackage rec {
     sha256 = "16skrn8qql9djpray25xv66rjgfl20js5wqnxyq1763nmyizyj8a";
   };
 
+  # Compatibility with ocaml-sat-solvers 0.8
+  patches = fetchpatch {
+    url = "https://github.com/tcsprojects/pgsolver/commit/e57a4fc5c8050b8d4ada5583a6c65ecf8cd65141.patch";
+    hash = "sha256-QFKxWByptnCl1SfleNASyXmKM2gkh1OE66L8PAZX+TU=";
+    includes = [
+      "src/solvers/*.ml"
+      "src/tools/*.ml"
+    ];
+  };
+
   buildInputs = [ ounit ];
   propagatedBuildInputs = [
     tcslib