0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-14 06:00:33 +03:00

python3Packages.z3-solver: rename from z3

This commit is contained in:
Yifei Sun 2023-12-03 15:17:48 -05:00
parent c2273e116f
commit 3d0affa9c9
No known key found for this signature in database
GPG key ID: D973170F9B86DB70
9 changed files with 16 additions and 21 deletions

View file

@ -24,7 +24,7 @@ let common = { version, sha256, patches ? [ ], tag ? "z3" }:
inherit version sha256 patches; inherit version sha256 patches;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Z3Prover"; owner = "Z3Prover";
repo = pname; repo = "z3";
rev = "${tag}-${version}"; rev = "${tag}-${version}";
sha256 = sha256; sha256 = sha256;
}; };

View file

@ -86,7 +86,7 @@ let
buildInputs = [ boost ] buildInputs = [ boost ]
++ lib.optionals z3Support [ z3 ] ++ lib.optionals z3Support [ z3 ]
++ lib.optionals cvc4Support [ cvc4 cln gmp ]; ++ lib.optionals cvc4Support [ cvc4 cln gmp ];
nativeCheckInputs = [ jq ncurses (python3.withPackages (ps: with ps; [ colorama deepdiff devtools docopt docutils requests sphinx tabulate z3 ])) ]; # contextlib2 glob2 textwrap3 traceback2 urllib3 nativeCheckInputs = [ jq ncurses (python3.withPackages (ps: with ps; [ colorama deepdiff devtools docopt docutils requests sphinx tabulate z3-solver ])) ]; # contextlib2 glob2 textwrap3 traceback2 urllib3
# tests take 60+ minutes to complete, only run as part of passthru tests # tests take 60+ minutes to complete, only run as part of passthru tests
doCheck = false; doCheck = false;

View file

@ -50,7 +50,7 @@ in stdenv.mkDerivation rec {
which perl hostname which perl hostname
# Some of the books require one or more of these external tools: # Some of the books require one or more of these external tools:
glucose minisat abc-verifier libipasir glucose minisat abc-verifier libipasir
z3 (python3.withPackages (ps: [ ps.z3 ])) z3 (python3.withPackages (ps: [ ps.z3-solver ]))
]; ];
# NOTE: Parallel building can be memory-intensive depending on the number of # NOTE: Parallel building can be memory-intensive depending on the number of

View file

@ -8,7 +8,7 @@
, pysmt , pysmt
, pythonOlder , pythonOlder
, pytestCheckHook , pytestCheckHook
, z3 , z3-solver
}: }:
buildPythonPackage rec { buildPythonPackage rec {
@ -34,19 +34,13 @@ buildPythonPackage rec {
decorator decorator
future future
pysmt pysmt
z3 z3-solver
]; ];
nativeCheckInputs = [ nativeCheckInputs = [
pytestCheckHook pytestCheckHook
]; ];
postPatch = ''
# Use upstream z3 implementation
substituteInPlace setup.cfg \
--replace "z3-solver==4.10.2.0" ""
'';
pythonImportsCheck = [ pythonImportsCheck = [
"claripy" "claripy"
]; ];

View file

@ -3,7 +3,7 @@
, fetchFromGitHub , fetchFromGitHub
, pythonOlder , pythonOlder
, flit-core , flit-core
, z3 , z3-solver
, astroid , astroid
, pytestCheckHook , pytestCheckHook
, hypothesis , hypothesis
@ -28,9 +28,7 @@ buildPythonPackage rec {
]; ];
postPatch = '' postPatch = ''
# Use upstream z3 implementation
substituteInPlace pyproject.toml \ substituteInPlace pyproject.toml \
--replace "\"z3-solver\"," "" \
--replace "\"--cov=deal_solver\"," "" \ --replace "\"--cov=deal_solver\"," "" \
--replace "\"--cov-report=html\"," "" \ --replace "\"--cov-report=html\"," "" \
--replace "\"--cov-report=xml\"," "" \ --replace "\"--cov-report=xml\"," "" \
@ -39,9 +37,9 @@ buildPythonPackage rec {
''; '';
propagatedBuildInputs = [ propagatedBuildInputs = [
z3 z3-solver
astroid astroid
] ++ z3.requiredPythonModules; ] ++ z3-solver.requiredPythonModules;
nativeCheckInputs = [ nativeCheckInputs = [
pytestCheckHook pytestCheckHook

View file

@ -33,7 +33,7 @@
, seaborn , seaborn
# Crosstalk-adaptive layout pass # Crosstalk-adaptive layout pass
, withCrosstalkPass ? false , withCrosstalkPass ? false
, z3 , z3-solver
# test requirements # test requirements
, ddt , ddt
, hypothesis , hypothesis
@ -53,7 +53,7 @@ let
pylatexenc pylatexenc
seaborn seaborn
]; ];
crosstalkPackages = [ z3 ]; crosstalkPackages = [ z3-solver ];
in in
buildPythonPackage rec { buildPythonPackage rec {

View file

@ -36,7 +36,7 @@ python3.pkgs.buildPythonApplication rec {
prompt-toolkit prompt-toolkit
pygments pygments
# pyside6 # pyside6
z3 z3-solver
]; ];
}; };

View file

@ -462,6 +462,7 @@ mapAliases ({
xenomapper = throw "xenomapper was moved to pkgs.xenomapper"; # added 2021-12-31 xenomapper = throw "xenomapper was moved to pkgs.xenomapper"; # added 2021-12-31
XlsxWriter = xlsxwriter; # added 2023-02-19 XlsxWriter = xlsxwriter; # added 2023-02-19
Yapsy = yapsy; # added 2023-02-19 Yapsy = yapsy; # added 2023-02-19
z3 = z3-solver; # added 2023-12-03
zake = throw "zake has been removed because it is abandoned"; # added 2023-06-20 zake = throw "zake has been removed because it is abandoned"; # added 2023-06-20
zc-buildout221 = zc-buildout; # added 2021-07-21 zc-buildout221 = zc-buildout; # added 2021-07-21
zc_buildout_nix = throw "zc_buildout_nix was pinned to a version no longer compatible with other modules"; zc_buildout_nix = throw "zc_buildout_nix was pinned to a version no longer compatible with other modules";

View file

@ -16113,9 +16113,11 @@ self: super: with self; {
z3c-checkversions = callPackage ../development/python-modules/z3c-checkversions { }; z3c-checkversions = callPackage ../development/python-modules/z3c-checkversions { };
z3 = (toPythonModule (pkgs.z3.override { z3-solver = (toPythonModule ((pkgs.z3.override {
inherit python; inherit python;
})).python; }).overrideAttrs (_: {
pname = "z3-solver";
}))).python;
zadnegoale = callPackage ../development/python-modules/zadnegoale { }; zadnegoale = callPackage ../development/python-modules/zadnegoale { };