From 3452c10bb477a606e00d1eb31d8c24749c15c53c Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Wed, 11 Jan 2023 14:57:59 +0000 Subject: z3_4_4_0: remove, z3_4_7: remove --- pkgs/applications/science/logic/z3/4.4.0.nix | 43 -------------------------- pkgs/applications/science/logic/z3/default.nix | 4 --- pkgs/top-level/all-packages.nix | 7 +---- 3 files changed, 1 insertion(+), 53 deletions(-) delete mode 100644 pkgs/applications/science/logic/z3/4.4.0.nix diff --git a/pkgs/applications/science/logic/z3/4.4.0.nix b/pkgs/applications/science/logic/z3/4.4.0.nix deleted file mode 100644 index 857bbbdee5d0..000000000000 --- a/pkgs/applications/science/logic/z3/4.4.0.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, python }: - -stdenv.mkDerivation rec { - pname = "z3"; - version = "4.4.0"; - - src = fetchFromGitHub { - owner = "Z3Prover"; - repo = "z3"; - rev = "7f6ef0b6c0813f2e9e8f993d45722c0e5b99e152"; - sha256 = "1xllvq9fcj4cz34biq2a9dn2sj33bdgrzyzkj26hqw70wkzv1kzx"; - }; - - buildInputs = [ python ]; - enableParallelBuilding = true; - - CXXFLAGS = if stdenv.isDarwin then "-std=gnu++98" else null; - - configurePhase = "python 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 = stdenv.hostPlatform.extensions.sharedLibrary; - installPhase = '' - mkdir -p $out/bin $out/lib/${python.libPrefix}/site-packages $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/lib/${python.libPrefix}/site-packages - cp z3*.pyc $out/lib/${python.libPrefix}/site-packages - cp ../src/api/python/*.py $out/lib/${python.libPrefix}/site-packages - ''; - - meta = { - description = "A high-performance theorem prover and SMT solver"; - homepage = "https://github.com/Z3Prover/z3"; - license = lib.licenses.mit; - platforms = lib.platforms.x86_64; - maintainers = with lib.maintainers; [ thoughtpolice ttuegel ]; - }; -} diff --git a/pkgs/applications/science/logic/z3/default.nix b/pkgs/applications/science/logic/z3/default.nix index 4d92f4f2ea34..75cfa2568f85 100644 --- a/pkgs/applications/science/logic/z3/default.nix +++ b/pkgs/applications/science/logic/z3/default.nix @@ -92,8 +92,4 @@ in version = "4.8.15"; sha256 = "0xkwqz0y5d1lfb6kfqy8wn8n2dqalzf4c8ghmjsajc1bpdl70yc5"; }; - z3_4_7 = common { - version = "4.7.1"; - sha256 = "1s850r6qifwl83zzgvrb5l0jigvmymzpv18ph71hg2bcpk7kjw3d"; - }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f33f49a051fc..8ddcdd178f66 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -36342,13 +36342,8 @@ with pkgs; inherit (callPackages ../applications/science/logic/z3 { python = python3; }) z3_4_11 - z3_4_8 - z3_4_7; + z3_4_8; z3 = z3_4_8; - z3_4_4_0 = callPackage ../applications/science/logic/z3/4.4.0.nix { - python = python2; - stdenv = if stdenv.isDarwin then stdenv else gcc49Stdenv; - }; z3-tptp = callPackage ../applications/science/logic/z3/tptp.nix {}; zchaff = callPackage ../applications/science/logic/zchaff { }; -- cgit v1.2.3