From 81a981f5d97ea7b4d8d2c34fb874abdc3d839065 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Feb 2025 02:04:54 +0000 Subject: [PATCH 1/3] unicorn: 2.1.1 -> 2.1.2 --- pkgs/development/libraries/unicorn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/unicorn/default.nix b/pkgs/development/libraries/unicorn/default.nix index 77947d5756b7..f71af5a0d22a 100644 --- a/pkgs/development/libraries/unicorn/default.nix +++ b/pkgs/development/libraries/unicorn/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "unicorn"; - version = "2.1.1"; + version = "2.1.2"; src = fetchFromGitHub { owner = "unicorn-engine"; repo = "unicorn"; tag = version; - hash = "sha256-ZlQ2WVTToT0OMxK6brsHnchxDwAR5n1wdtZtkTTgWV4="; + hash = "sha256-qA84xBztyWmt/rUExhhZMkQzvDPx0UE9MAIPG/Su3iE="; }; nativeBuildInputs = From b52a2edf379b284fb4770e5eb5d2e43880c3a2f6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 9 Mar 2025 00:24:16 +0100 Subject: [PATCH 2/3] unicorn: 2.1.2 -> 2.1.3 Diff: https://github.com/unicorn-engine/unicorn/compare/refs/tags/2.1.2...2.1.3 --- pkgs/development/libraries/unicorn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/unicorn/default.nix b/pkgs/development/libraries/unicorn/default.nix index f71af5a0d22a..e9977ff75160 100644 --- a/pkgs/development/libraries/unicorn/default.nix +++ b/pkgs/development/libraries/unicorn/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "unicorn"; - version = "2.1.2"; + version = "2.1.3"; src = fetchFromGitHub { owner = "unicorn-engine"; repo = "unicorn"; tag = version; - hash = "sha256-qA84xBztyWmt/rUExhhZMkQzvDPx0UE9MAIPG/Su3iE="; + hash = "sha256-vBggblml+lQFhyNrfIp5GKVQ09fd+ccblKHEzWteMbI="; }; nativeBuildInputs = From 355ad3b1e1891c6523c1e2b057666e1677618541 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 9 Mar 2025 00:38:03 +0100 Subject: [PATCH 3/3] python313Packages.unicorn: refactor --- .../python-modules/unicorn/default.nix | 22 +++++++++++-------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/unicorn/default.nix b/pkgs/development/python-modules/unicorn/default.nix index b1b630c237da..1f0fba4be262 100644 --- a/pkgs/development/python-modules/unicorn/default.nix +++ b/pkgs/development/python-modules/unicorn/default.nix @@ -2,6 +2,9 @@ lib, stdenv, buildPythonPackage, + capstone, + pytestCheckHook, + setuptools-scm, setuptools, unicorn, }: @@ -32,17 +35,18 @@ buildPythonPackage rec { "macosx_11_0" ]; - build-system = [ setuptools ]; + build-system = [ + setuptools + setuptools-scm + ]; - checkPhase = '' - runHook preCheck + nativeCheckInputs = [ + capstone + pytestCheckHook + ]; - mv unicorn unicorn.hidden - patchShebangs sample_*.py shellcode.py - sh -e sample_all.sh - - runHook postCheck - ''; + # this test does not appear to be intended as a pytest-style test + disabledTests = [ "test_i386" ]; pythonImportsCheck = [ "unicorn" ];