about summary refs log tree commit diff
diff options
context:
space:
mode:
authorFabian Affolter <mail@fabian-affolter.ch>2024-03-28 23:14:39 +0100
committerFabian Affolter <mail@fabian-affolter.ch>2024-03-28 23:14:39 +0100
commite4daa76528288450144d0389631b04103dd75921 (patch)
tree092f084e8600c99ebd390ea7a5c0da1da0767591
parent8c93cec3778908e0d3295c31da6fa62f315dd71c (diff)
downloadnixlib-e4daa76528288450144d0389631b04103dd75921.tar
nixlib-e4daa76528288450144d0389631b04103dd75921.tar.gz
nixlib-e4daa76528288450144d0389631b04103dd75921.tar.bz2
nixlib-e4daa76528288450144d0389631b04103dd75921.tar.lz
nixlib-e4daa76528288450144d0389631b04103dd75921.tar.xz
nixlib-e4daa76528288450144d0389631b04103dd75921.tar.zst
nixlib-e4daa76528288450144d0389631b04103dd75921.zip
python311Packages.pyvex: refactor
-rw-r--r--pkgs/development/python-modules/cle/default.nix6
-rw-r--r--pkgs/development/python-modules/pyvex/default.nix6
2 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/development/python-modules/cle/default.nix b/pkgs/development/python-modules/cle/default.nix
index f67ad6c24e49..75209568d84e 100644
--- a/pkgs/development/python-modules/cle/default.nix
+++ b/pkgs/development/python-modules/cle/default.nix
@@ -16,14 +16,14 @@
 
 let
   # The binaries are following the argr projects release cycle
-  version = "9.2.84";
+  version = "9.2.96";
 
   # Binary files from https://github.com/angr/binaries (only used for testing and only here)
   binaries = fetchFromGitHub {
     owner = "angr";
     repo = "binaries";
     rev = "refs/tags/v${version}";
-    hash = "sha256-sU9Rv2kTLYMpaalrkcOv6HlHt1u4oG482M+d7OSjJ3Y=";
+    hash = "sha256-eC9qQCrms4pSXYTrKJlfdejhl/kzUmmyfYhjlEPpgzA=";
   };
 
 in
@@ -38,7 +38,7 @@ buildPythonPackage rec {
     owner = "angr";
     repo = "cle";
     rev = "refs/tags/v${version}";
-    hash = "sha256-N0z5wgaeWkoPuhIUj7bj1kDKgZ7pWChm1uEU4MjXjqI=";
+    hash = "sha256-osClaoAzjf3mOng38disxxSFncbc/V7Uuc1HCTdX4SQ=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/pyvex/default.nix b/pkgs/development/python-modules/pyvex/default.nix
index 3259d3133d87..1e51c7693830 100644
--- a/pkgs/development/python-modules/pyvex/default.nix
+++ b/pkgs/development/python-modules/pyvex/default.nix
@@ -23,11 +23,11 @@ buildPythonPackage rec {
     hash = "sha256-44F1EE8TRsmYRnMNQakxIaFdAuZKpHIDsq+M1cK/pQk=";
   };
 
-  nativeBuildInputs = [
+  build-system = [
     setuptools
   ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     archinfo
     bitstring
     cffi
@@ -37,7 +37,7 @@ buildPythonPackage rec {
 
   postPatch = lib.optionalString stdenv.isDarwin ''
     substituteInPlace vex/Makefile-gcc \
-      --replace '/usr/bin/ar' 'ar'
+      --replace-fail '/usr/bin/ar' 'ar'
   '';
 
   setupPyBuildFlags = lib.optionals stdenv.isLinux [