cubicle: 1.1.2 -> 1.2.0

pkgs/applications/science/logic/cubicle/default.nix

@@ -1,18 +1,40 @@
-{ lib, stdenv, fetchurl, ocamlPackages }:
+{ lib
+, stdenv
+, fetchurl
+, autoreconfHook
+, which
+, ocamlPackages
+}:
 
 stdenv.mkDerivation rec {
   pname = "cubicle";
-  version = "1.1.2";
+  version = "1.2.0";
   src = fetchurl {
-    url = "http://cubicle.lri.fr/cubicle-${version}.tar.gz";
+    url = "https://github.com/cubicle-model-checker/cubicle/archive/refs/tags/${version}.tar.gz";
-    sha256 = "10kk80jdmpdvql88sdjsh7vqzlpaphd8vip2lp47aarxjkwjlz1q";
+    hash = "sha256-/EtbXpyXqRm0jGcMfGLAEwdr92061edjFys1V7/w6/Y=";
   };
 
+  # https://github.com/cubicle-model-checker/cubicle/issues/1
   postPatch = ''
-    substituteInPlace Makefile.in --replace "\\n" ""
+    substituteInPlace Makefile.in \
+      --replace "@OCAMLC@" "ocamlfind ocamlc -package num" \
+      --replace "@OCAMLOPT@" "ocamlfind ocamlopt -package num"
   '';
 
-  buildInputs = with ocamlPackages; [ ocaml findlib functory ];
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    autoreconfHook
+    which
+  ] ++ (with ocamlPackages; [
+    findlib
+    ocaml
+  ]);
+
+  buildInputs = with ocamlPackages; [
+    functory
+    num
+  ];
 
   meta = with lib; {
     description = "An open source model checker for verifying safety properties of array-based systems";

pkgs/top-level/all-packages.nix

@@ -36145,9 +36145,7 @@ with pkgs;
 
   crypto-org-wallet = callPackage ../applications/blockchains/crypto-org-wallet { };
 
-  cubicle = callPackage ../applications/science/logic/cubicle {
+  cubicle = callPackage ../applications/science/logic/cubicle { };
-    ocamlPackages = ocaml-ng.ocamlPackages_4_05;
-  };
 
   cvc3 = callPackage ../applications/science/logic/cvc3 {
     gmp = lib.overrideDerivation gmp (_: { dontDisableStatic = true; });