diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-01-30 00:12:10 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-30 00:12:10 +0000 |
| commit | b0233d387cce36e7f5f9d94d86539972a5bbd2e3 (patch) | |
| tree | 75aa1515923458281c2c3a623a234471fddef386 /pkgs/applications/science/logic | |
| parent | c2791e85dedb9672f95e34dc1ec39d77b79c86c1 (diff) | |
| parent | fb15daf152589b58ba1e1194968a545faa7fbe5a (diff) | |
Merge master into haskell-updates
Diffstat (limited to 'pkgs/applications/science/logic')
| -rw-r--r-- | pkgs/applications/science/logic/easycrypt/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/applications/science/logic/why3/default.nix | 24 |
2 files changed, 22 insertions, 5 deletions
diff --git a/pkgs/applications/science/logic/easycrypt/default.nix b/pkgs/applications/science/logic/easycrypt/default.nix index 36ff9f2046f8b..2869bcd6e1e3c 100644 --- a/pkgs/applications/science/logic/easycrypt/default.nix +++ b/pkgs/applications/science/logic/easycrypt/default.nix @@ -22,11 +22,12 @@ stdenv.mkDerivation rec { batteries dune-build-info inifiles + why3 yojson zarith ]; - propagatedBuildInputs = [ why3 ]; + propagatedBuildInputs = [ why3.out ]; strictDeps = true; diff --git a/pkgs/applications/science/logic/why3/default.nix b/pkgs/applications/science/logic/why3/default.nix index f0567fdda3b6b..1676ca4c2a4f1 100644 --- a/pkgs/applications/science/logic/why3/default.nix +++ b/pkgs/applications/science/logic/why3/default.nix @@ -1,6 +1,8 @@ { callPackage, fetchurl, lib, stdenv , ocamlPackages, coqPackages, rubber, hevea, emacs -, version ? "1.7.0" +, version ? "1.7.1" +, ideSupport ? true +, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -10,15 +12,18 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://why3.gitlabpages.inria.fr/releases/${pname}-${version}.tar.gz"; hash = { - "1.7.0" = "sha256-rygrjzuJVukOvpuXTG/yeoEP98ZFkLQHObgc3My1PVY="; + "1.7.1" = "sha256-rG1hcxFhQ2PlE9RTz9ELliDjCuSzLnJ1togRY637cU4="; "1.6.0" = "sha256-hFvM6kHScaCtcHCc6Vezl9CR7BFbiKPoTEh7kj0ZJxw="; }."${version}"; }; strictDeps = true; - nativeBuildInputs = with ocamlPackages; [ + nativeBuildInputs = lib.optional ideSupport + wrapGAppsHook + ++ (with ocamlPackages; [ ocaml findlib menhir + ]) ++ [ # Coq Support coqPackages.coq ]; @@ -29,8 +34,10 @@ stdenv.mkDerivation rec { emacs # Documentation rubber hevea + ] ++ lib.optional ideSupport # GUI lablgtk3-sourceview3 + ++ [ # WebIDE js_of_ocaml js_of_ocaml-ppx # S-expression output for why3pp @@ -44,10 +51,19 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - configureFlags = [ "--enable-verbose-make" ]; + configureFlags = [ "--enable-verbose-make" + (lib.enableFeature ideSupport "ide") + ]; + + outputs = [ "out" "dev" ]; installTargets = [ "install" "install-lib" ]; + postInstall = '' + mkdir -p $dev/lib + mv $out/lib/ocaml $dev/lib/ + ''; + passthru.withProvers = callPackage ./with-provers.nix {}; meta = with lib; { |