From d0cdb657c2f6a87e5089ba33c0a58fd52edddf10 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 23 Jan 2024 06:46:47 +0100 Subject: [PATCH] why3: move the OCaml library to its own dev output --- pkgs/applications/science/logic/easycrypt/default.nix | 3 ++- pkgs/applications/science/logic/why3/default.nix | 7 +++++++ pkgs/development/tools/analysis/frama-c/default.nix | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/logic/easycrypt/default.nix b/pkgs/applications/science/logic/easycrypt/default.nix index 36ff9f2046f8..2869bcd6e1e3 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 758d11e4252a..1676ca4c2a4f 100644 --- a/pkgs/applications/science/logic/why3/default.nix +++ b/pkgs/applications/science/logic/why3/default.nix @@ -55,8 +55,15 @@ stdenv.mkDerivation rec { (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; { diff --git a/pkgs/development/tools/analysis/frama-c/default.nix b/pkgs/development/tools/analysis/frama-c/default.nix index 0ff3e6ad1af6..1bf477cf3d16 100644 --- a/pkgs/development/tools/analysis/frama-c/default.nix +++ b/pkgs/development/tools/analysis/frama-c/default.nix @@ -20,7 +20,7 @@ let ppx_deriving_yojson ppx_import stdlib-shims - why3 + why3.dev re result seq