diff options
| author | Alyssa Ross <hi@alyssa.is> | 2022-12-06 19:57:55 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-02-08 13:48:30 +0000 |
| commit | bf3aadfdd39aa197e18bade671fab6726349ffa4 (patch) | |
| tree | 698567af766ed441d757b57a7b21e68d4a342a2b /nixpkgs/pkgs/development/python-modules/archinfo | |
| parent | f4afc5a01d9539ce09e47494e679c51f80723d07 (diff) | |
| parent | 99665eb45f58d959d2cb9e49ddb960c79d596f33 (diff) | |
| download | nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.gz nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.bz2 nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.lz nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.xz nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.zst nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.zip | |
Merge commit '99665eb45f58d959d2cb9e49ddb960c79d596f33'
Diffstat (limited to 'nixpkgs/pkgs/development/python-modules/archinfo')
| -rw-r--r-- | nixpkgs/pkgs/development/python-modules/archinfo/default.nix | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/nixpkgs/pkgs/development/python-modules/archinfo/default.nix b/nixpkgs/pkgs/development/python-modules/archinfo/default.nix index f9affcddd122..651404e7fedc 100644 --- a/nixpkgs/pkgs/development/python-modules/archinfo/default.nix +++ b/nixpkgs/pkgs/development/python-modules/archinfo/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchFromGitHub -, fetchpatch , pytestCheckHook , nose , pythonOlder @@ -9,8 +8,8 @@ buildPythonPackage rec { pname = "archinfo"; - version = "9.1.12332"; - format = "setuptools"; + version = "9.2.14"; + format = "pyproject"; disabled = pythonOlder "3.6"; @@ -18,7 +17,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-nv/hwQZgKv/cM8fF6GqI8zY9GAe8aCZ/AGFOmhz+bMM="; + hash = "sha256-kWZ5z9Tn0SAqrGP4gtGfPny+kj/2ibSdTwp+0RCx40s="; }; checkInputs = [ @@ -26,15 +25,6 @@ buildPythonPackage rec { pytestCheckHook ]; - patches = [ - # Make archinfo import without installing pyvex, https://github.com/angr/archinfo/pull/113 - (fetchpatch { - name = "fix-import-issue.patch"; - url = "https://github.com/angr/archinfo/commit/d29c108f55ffd458ff1d3d65db2d651c76b19267.patch"; - sha256 = "sha256-9vi0QyqQLIPQxFuB8qrpcnPXWOJ6d27/IXJE/Ui6HhM="; - }) - ]; - pythonImportsCheck = [ "archinfo" ]; @@ -43,6 +33,6 @@ buildPythonPackage rec { description = "Classes with architecture-specific information"; homepage = "https://github.com/angr/archinfo"; license = with licenses; [ bsd2 ]; - maintainers = [ maintainers.fab ]; + maintainers = with maintainers; [ fab ]; }; } |