diff options
| author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-01-09 16:24:05 +0100 |
|---|---|---|
| committer | Vincent Laporte <vbgl@users.noreply.github.com> | 2023-01-09 16:52:18 +0100 |
| commit | 1f4c190affbd9c2297119e164f6615b876139781 (patch) | |
| tree | 5e422cf650af98cf9608e44a40ad6087285c137c /pkgs | |
| parent | 2ec805b168c9ef754ad488e700d8c05cb948bbfd (diff) | |
| download | nixpkgs-1f4c190affbd9c2297119e164f6615b876139781.tar nixpkgs-1f4c190affbd9c2297119e164f6615b876139781.tar.gz nixpkgs-1f4c190affbd9c2297119e164f6615b876139781.tar.bz2 nixpkgs-1f4c190affbd9c2297119e164f6615b876139781.tar.lz nixpkgs-1f4c190affbd9c2297119e164f6615b876139781.tar.xz nixpkgs-1f4c190affbd9c2297119e164f6615b876139781.tar.zst nixpkgs-1f4c190affbd9c2297119e164f6615b876139781.zip | |
cubicle: 1.1.2 -> 1.2.0
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/science/logic/cubicle/default.nix | 34 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 29 insertions, 9 deletions
diff --git a/pkgs/applications/science/logic/cubicle/default.nix b/pkgs/applications/science/logic/cubicle/default.nix index aa3fba635ff..4719a69c012 100644 --- a/pkgs/applications/science/logic/cubicle/default.nix +++ b/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"; - sha256 = "10kk80jdmpdvql88sdjsh7vqzlpaphd8vip2lp47aarxjkwjlz1q"; + url = "https://github.com/cubicle-model-checker/cubicle/archive/refs/tags/${version}.tar.gz"; + 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"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5971d6bbb3a..1ffde8e34ba 100644 --- a/pkgs/top-level/all-packages.nix +++ b/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 { - ocamlPackages = ocaml-ng.ocamlPackages_4_05; - }; + cubicle = callPackage ../applications/science/logic/cubicle { }; cvc3 = callPackage ../applications/science/logic/cvc3 { gmp = lib.overrideDerivation gmp (_: { dontDisableStatic = true; }); |