@@ -1,9 +1,15 @@
1−{ lib, stdenv, fetchFromGitHub, python, fixDarwinDylibNames
1+{ lib
2+, stdenv
3+, fetchFromGitHub
4+, python
5+, fixDarwinDylibNames
26, javaBindings ? false
37, ocamlBindings ? false
48, pythonBindings ? true
59, jdk ? null
6−, ocaml ? null, findlib ? null, zarith ? null
10+, ocaml ? null
11+, findlib ? null
12+, zarith ? null
713}:
814
915assert javaBindings -> jdk != null;
@@ -13,19 +19,19 @@ with lib;
1319
1420stdenv.mkDerivation rec {
1521 pname = "z3";
16− version = "4.8.9";
22+ version = "4.8.10";
1723
1824 src = fetchFromGitHub {
19− owner = "Z3Prover";
20− repo = pname;
21− rev = "z3-${version}";
22− sha256 = "1hnbzq10d23drd7ksm3c1n2611c3kd0q0yxgz8y78zaafwczvwxx";
25+ owner = "Z3Prover";
26+ repo = pname;
27+ rev = "z3-${version}";
28+ sha256 = "1w1ym2l0gipvjx322npw7lhclv8rslq58gnj0d9i96masi3gbycf";
2329 };
2430
2531 nativeBuildInputs = optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
2632 buildInputs = [ python ]
27− ++ optional javaBindings jdk
28− ++ optionals ocamlBindings [ ocaml findlib zarith ]
33+ ++ optional javaBindings jdk
34+ ++ optionals ocamlBindings [ ocaml findlib zarith ]
2935 ;
3036 propagatedBuildInputs = [ python.pkgs.setuptools ];
3137 enableParallelBuilding = true;
@@ -35,16 +41,17 @@ stdenv.mkDerivation rec {
3541 mkdir -p $OCAMLFIND_DESTDIR/stublibs
3642 '';
3743
38− configurePhase = concatStringsSep " " (
39− [ "${python.interpreter} scripts/mk_make.py --prefix=$out" ]
40− ++ optional javaBindings "--java"
41− ++ optional ocamlBindings "--ml"
42− ++ optional pythonBindings "--python --pypkgdir=$out/${python.sitePackages}"
43− ) + "\n" + "cd build";
44+ configurePhase = concatStringsSep " "
45+ (
46+ [ "${python.interpreter} scripts/mk_make.py --prefix=$out" ]
47+ ++ optional javaBindings "--java"
48+ ++ optional ocamlBindings "--ml"
49+ ++ optional pythonBindings "--python --pypkgdir=$out/${python.sitePackages}"
50+ ) + "\n" + "cd build";
4451
4552 postInstall = ''
4653 mkdir -p $dev $lib
47− mv $out/lib $lib/lib
54+ mv $out/lib $lib/lib
4855 mv $out/include $dev/include
4956 '' + optionalString pythonBindings ''
5057 mkdir -p $python/lib
@@ -53,14 +60,13 @@ stdenv.mkDerivation rec {
5360 '';
5461
5562 outputs = [ "out" "lib" "dev" "python" ]
56− ++ optional ocamlBindings "ocaml"
57− ;
63+ ++ optional ocamlBindings "ocaml";
5864
59− meta = {
65+ meta = with lib; {
6066 description = "A high-performance theorem prover and SMT solver";
61− homepage = "https://github.com/Z3Prover/z3";
62− license = lib.licenses.mit;
63− platforms = lib.platforms.unix;
64− maintainers = with lib.maintainers; [ thoughtpolice ttuegel ];
67+ homepage = "https://github.com/Z3Prover/z3";
68+ license = licenses.mit;
69+ platforms = platforms.unix;
70+ maintainers = with maintainers; [ thoughtpolice ttuegel ];
6571 };
6672}