mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-21 12:59:04 +02:00
z3_opt: remove and replace with z3
Z3 has supported optimization features since the 4.4.x release, so this can be removed. Signed-off-by: Austin Seipp <aseipp@pobox.com>
This commit is contained in:
parent
583ebc086c
commit
54ae0aa1b0
|
@ -1,46 +0,0 @@
|
||||||
{ stdenv, fetchFromGitHub, python2 }:
|
|
||||||
|
|
||||||
# Copied shamelessly from the normal z3 .nix
|
|
||||||
|
|
||||||
let
|
|
||||||
python = python2;
|
|
||||||
in stdenv.mkDerivation rec {
|
|
||||||
name = "z3_opt-${version}";
|
|
||||||
version = "4.3.2";
|
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
|
||||||
owner = "Z3Prover";
|
|
||||||
repo = "z3";
|
|
||||||
rev = "9377779e5818b2ca15c4f39921b2ba3a42f948e7";
|
|
||||||
sha256 = "15d6hsb61hrm5vy3l2gnkrfnqr68lvspnznm17vyhm61ld33yaff";
|
|
||||||
};
|
|
||||||
|
|
||||||
buildInputs = [ python ];
|
|
||||||
enableParallelBuilding = true;
|
|
||||||
|
|
||||||
configurePhase = "${python.interpreter} scripts/mk_make.py --prefix=$out && cd build";
|
|
||||||
|
|
||||||
# z3's install phase is stupid because it tries to calculate the
|
|
||||||
# python package store location itself, meaning it'll attempt to
|
|
||||||
# write files into the nix store, and fail.
|
|
||||||
soext = if stdenv.system == "x86_64-darwin" then ".dylib" else ".so";
|
|
||||||
installPhase = ''
|
|
||||||
mkdir -p $out/bin $out/${python.sitePackages} $out/include
|
|
||||||
cp ../src/api/z3*.h $out/include
|
|
||||||
cp ../src/api/c++/z3*.h $out/include
|
|
||||||
cp z3 $out/bin
|
|
||||||
cp libz3${soext} $out/lib
|
|
||||||
cp libz3${soext} $out/${python.sitePackages}
|
|
||||||
cp z3*.pyc $out/${python.sitePackages}
|
|
||||||
cp ../src/api/python/*.py $out/${python.sitePackages}
|
|
||||||
'';
|
|
||||||
|
|
||||||
meta = {
|
|
||||||
description = "A high-performance theorem prover and SMT solver, optimization edition";
|
|
||||||
homepage = "https://github.com/Z3Prover/z3";
|
|
||||||
license = stdenv.lib.licenses.mit;
|
|
||||||
platforms = stdenv.lib.platforms.unix;
|
|
||||||
maintainers = with stdenv.lib.maintainers; [ thoughtpolice sheganinans ];
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
{ stdenv, fetchFromGitHub, cmake, makeWrapper
|
{ stdenv, fetchFromGitHub, cmake, makeWrapper
|
||||||
, llvmPackages_4, hiredis, z3_opt, gtest
|
, llvmPackages_4, hiredis, z3, gtest
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
|
@ -46,7 +46,7 @@ in stdenv.mkDerivation rec {
|
||||||
cp -v ./souper $out/bin/
|
cp -v ./souper $out/bin/
|
||||||
cp -v ./clang-souper $out/bin/
|
cp -v ./clang-souper $out/bin/
|
||||||
wrapProgram "$out/bin/souper" \
|
wrapProgram "$out/bin/souper" \
|
||||||
--add-flags "-z3-path=\"${z3_opt}/bin/z3\""
|
--add-flags "-z3-path=\"${z3}/bin/z3\""
|
||||||
'';
|
'';
|
||||||
|
|
||||||
meta = with stdenv.lib; {
|
meta = with stdenv.lib; {
|
||||||
|
|
|
@ -18407,7 +18407,6 @@ with pkgs;
|
||||||
};
|
};
|
||||||
|
|
||||||
z3 = callPackage ../applications/science/logic/z3 {};
|
z3 = callPackage ../applications/science/logic/z3 {};
|
||||||
z3_opt = callPackage ../applications/science/logic/z3_opt {};
|
|
||||||
|
|
||||||
boolector = callPackage ../applications/science/logic/boolector {};
|
boolector = callPackage ../applications/science/logic/boolector {};
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue