From 8a89abcb7897d989e0d6067c57e42b8d1d82c8ba Mon Sep 17 00:00:00 2001 From: Yongun Seong Date: Sat, 20 May 2023 05:34:03 +0900 Subject: [PATCH 1/2] python3Packages.manticore: remove --- .../python-modules/manticore/default.nix | 136 ------------------ pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 4 - 3 files changed, 1 insertion(+), 140 deletions(-) delete mode 100644 pkgs/development/python-modules/manticore/default.nix diff --git a/pkgs/development/python-modules/manticore/default.nix b/pkgs/development/python-modules/manticore/default.nix deleted file mode 100644 index 8bc54fabf184..000000000000 --- a/pkgs/development/python-modules/manticore/default.nix +++ /dev/null @@ -1,136 +0,0 @@ -{ lib -, buildPythonPackage -, capstone -, crytic-compile -, fetchFromGitHub -, intervaltree -, ply -, prettytable -, protobuf -, pyelftools -, pyevmasm -, pysha3 -, pytestCheckHook -, pythonOlder -, pyyaml -, rlp -, stdenv -, unicorn -, wasm -, yices -, z3 -}: - -buildPythonPackage rec { - pname = "manticore"; - version = "0.3.7"; - format = "setuptools"; - - disabled = pythonOlder "3.7"; - - src = fetchFromGitHub { - owner = "trailofbits"; - repo = "manticore"; - rev = version; - hash = "sha256-+17VBfAtkZZIi3SF5Num1Uqg3WjIpgbz3Jx65rD5zkM="; - }; - - propagatedBuildInputs = [ - crytic-compile - intervaltree - ply - prettytable - protobuf - pyevmasm - pysha3 - pyyaml - rlp - wasm - ] ++ lib.optionals (stdenv.isLinux) [ - capstone - pyelftools - unicorn - ]; - - postPatch = '' - # Python API is not used in the code, only z3 from PATH - substituteInPlace setup.py \ - --replace "z3-solver" "" \ - --replace "crytic-compile==0.2.2" "crytic-compile>=0.2.2" - ''; - - nativeCheckInputs = [ - pytestCheckHook - ]; - - preCheck = '' - export PATH=${yices}/bin:${z3}/bin:$PATH - ''; - - disabledTestPaths = [ - "tests/ethereum" # Enable when solc works again - "tests/ethereum_bench" - ] ++ lib.optionals (!stdenv.isLinux) [ - "tests/native" - "tests/other/test_locking.py" - "tests/other/test_state_introspection.py" - ]; - - disabledTests = [ - # Failing tests - "test_chmod" - "test_timeout" - "test_wasm_main" - # Slow tests - "testmprotectFailSymbReading" - "test_ConstraintsForking" - "test_resume" - "test_symbolic" - "test_symbolic_syscall_arg" - "test_state_merging" - "test_decree" - "test_register_comparison" - "test_arguments_assertions_armv7" - "test_integration_basic_stdout" - "test_fclose_linux_amd64" - "test_fileio_linux_amd64" - "test_arguments_assertions_amd64" - "test_ioctl_bogus" - "test_ioctl_socket" - "test_brk_regression" - "test_basic_arm" - "test_logger_verbosity" - "test_profiling_data" - "test_integration_basic_stdin" - "test_getchar" - "test_ccmp_reg" - "test_ld1_mlt_structs" - "test_ccmp_imm" - "test_try_to_allocate_greater_than_last_space_memory_page_12" - "test_not_enough_memory_page_12" - "test_PCMPISTRI_30_symbolic" - "test_ld1_mlt_structs" - "test_time" - "test_implicit_call" - "test_trace" - "test_plugin" - # Tests are failing with latest unicorn - "Aarch64UnicornInstructions" - "test_integration_resume" - ]; - - pythonImportsCheck = [ - "manticore" - ]; - - meta = with lib; { - # m.c.manticore:WARNING: Manticore is only supported on Linux. Proceed at your own risk! - broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; - description = "Symbolic execution tool for analysis of smart contracts and binaries"; - homepage = "https://github.com/trailofbits/manticore"; - changelog = "https://github.com/trailofbits/manticore/releases/tag/${version}"; - license = licenses.agpl3Only; - platforms = platforms.unix; - maintainers = with maintainers; [ arturcygan ]; - }; -} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 882c75b9aed8..08f14364af15 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -160,6 +160,7 @@ mapAliases ({ mailman = throw "Please use pkgs.mailman"; # added 2022-04-29 mailman-hyperkitty = throw "Please use pkgs.mailmanPackages.mailman-hyperkitty"; # added 2022-04-29 mailman-web = throw "Please use pkgs.mailman-web"; # added 2022-04-29 + manticore = throw "manticore has been removed because its dependency wasm no longer builds and is unmaintained"; # added 2023-05-20 mistune_0_8 = throw "mistune_0_8 was removed because it was outdated and insecure"; # added 2022-08-12 mistune_2_0 = mistune; # added 2022-08-12 mox = throw "mox was removed because it is unmaintained"; # added 2023-02-21 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9f2309f864cf..787daef23160 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5966,10 +5966,6 @@ self: super: with self; { manuel = callPackage ../development/python-modules/manuel { }; - manticore = callPackage ../development/python-modules/manticore { - inherit (pkgs) z3; - }; - mapbox = callPackage ../development/python-modules/mapbox { }; mapbox-earcut = callPackage ../development/python-modules/mapbox-earcut { }; From 7c5d339b09a02c25af5333cb9de071faaa946b26 Mon Sep 17 00:00:00 2001 From: Yongun Seong Date: Sat, 20 May 2023 05:35:09 +0900 Subject: [PATCH 2/2] python3Packages.wasm: remove --- .../python-modules/wasm/default.nix | 30 ------------------- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 -- 3 files changed, 1 insertion(+), 32 deletions(-) delete mode 100644 pkgs/development/python-modules/wasm/default.nix diff --git a/pkgs/development/python-modules/wasm/default.nix b/pkgs/development/python-modules/wasm/default.nix deleted file mode 100644 index adc3c958bee1..000000000000 --- a/pkgs/development/python-modules/wasm/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ buildPythonPackage -, fetchPypi -, pythonAtLeast -, lib -}: - -buildPythonPackage rec { - pname = "wasm"; - version = "1.2"; - - disabled = pythonAtLeast "3.10"; # project is abandoned, remove we whe move to py310/311 - - src = fetchPypi { - inherit pname version; - sha256 = "179xcinfc35xgk0bf9y58kwxzymzk7c1p58w6khmqfiqvb91j3r8"; - }; - - # there are no tests - doCheck = false; - - pythonImportsCheck = [ "wasm" ]; - - meta = with lib; { - description = "WebAssembly decoder and disassembler"; - homepage = "https://github.com/athre0z/wasm"; - changelog = "https://github.com/athre0z/wasm/blob/master/CHANGELOG.md"; - license = licenses.mit; - maintainers = with maintainers; [ arturcygan ]; - }; -} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 08f14364af15..d1e377abe03e 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -306,6 +306,7 @@ mapAliases ({ uproot3-methods = throw "uproot3-methods has been removed"; # added 2022-12-13 virtual-display = throw "virtual-display has been renamed to PyVirtualDisplay"; # added 2023-01-07 Wand = wand; # added 2022-11-13 + wasm = throw "wasm has been removed because it no longer builds and is unmaintained"; # added 2023-05-20 WazeRouteCalculator = wazeroutecalculator; # added 2021-09-29 weakrefmethod = throw "weakrefmethod was removed since it's not needed in Python >= 3.4"; # added 2022-12-01 webapp2 = throw "webapp2 is unmaintained since 2012"; # added 2022-05-29 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 787daef23160..6402f35bd98a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12786,8 +12786,6 @@ self: super: with self; { wasserstein = callPackage ../development/python-modules/wasserstein { }; - wasm = callPackage ../development/python-modules/wasm { }; - wasmerPackages = pkgs.recurseIntoAttrs (callPackage ../development/python-modules/wasmer { }); inherit (self.wasmerPackages) wasmer wasmer-compiler-cranelift wasmer-compiler-llvm wasmer-compiler-singlepass;