-
Notifications
You must be signed in to change notification settings - Fork 79
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Update flake.lock #704
Update flake.lock #704
Conversation
7d3abc3
to
c39fce0
Compare
02571c2
to
6ce2000
Compare
6ce2000
to
00830d7
Compare
So Nix restored runtime dependency checking for python packages (see https://discourse.nixos.org/t/breaking-changes-announcement-for-unstable/17574/40?page=2). We're hitting a wall with LIEF for two reasons:
|
Since I was working on upgrading some packages, I decided to take care of all of them. Pyright is now reporting more issues, but these are relevant and should be either handled or ignored depending on importance. |
We were already talking about ditching LIEF as a dependency internally, this package issue might be a good excuse to kickstart this change. |
I don't understand this. We need to relax in unblob: diff --git a/nix/unblob/default.nix b/nix/unblob/default.nix
index 0be6c88..b2c0c0d 100644
--- a/nix/unblob/default.nix
+++ b/nix/unblob/default.nix
@@ -108,6 +108,7 @@ let
pythonRelaxDeps = [
"dissect.cstruct"
+ "lief"
"structlog"
];
makeWrapperArgs = [ This did the trick for me. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nitpick: lz4 and lark are updated in the same commit
We could also update dissect.cstruct
to 3.x, as the nix derivation already uses 3.10 without issues and can get rid of one pythonRelaxDeps
entry.
Regarding pyright errors, I think the type hint in diff --git a/python/pyperscan/_pyperscan.pyi b/python/pyperscan/_pyperscan.pyi
index c5d1e64..142f554 100644
--- a/python/pyperscan/_pyperscan.pyi
+++ b/python/pyperscan/_pyperscan.pyi
@@ -176,12 +176,12 @@ class OnMatch(Protocol, Generic[_TContext_contra]):
"""Callback called on match."""
def __call__(
- self, context: _TContext_contra, tag: Any, start: int, end: Any
+ self, context: _TContext_contra, tag: Any, start: int, end: int, /
) -> Scan:
"""Called when a match happens.
Note:
- Call parameters are passed positonally.
+ Call parameters are passed positionally.
Args:
context: Object passed to [Database.build][pyperscan._pyperscan.Database.build] I'd suggest ignoring those for now, and it will be fixed in an upcoming version. |
Looked into the pyright issues. Some of them were present before but wasn't reported, because they were disabled. In pyright 1.1.339 the default Footnotes |
Thanks for the pointers @vlaci ! Will look into it this week-end. |
1225678
to
a3b6676
Compare
Split into two separate commits.
Upgrading
Done in 42cdc5a
Set back to |
a3b6676
to
9effea5
Compare
9effea5
to
cd1bcbd
Compare
Flake lock file updates: • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/63143ac2c9186be6d9da6035fa22620018c85932' (2024-01-02) → 'github:NixOS/nixpkgs/eabe8d3eface69f5bb16c18f8662a702f50c20d5' (2024-01-09) • Updated input 'unblob-native': 'github:onekey-sec/unblob-native/4dbd25ac361cabd6b55dc149c7a5648a3c703a17' (2024-01-08) → 'github:onekey-sec/unblob-native/e225550e8a3b58f0e508888ea05fca3b30d8f1e7' (2024-01-10)
Flake lock file updates: • Updated input 'filter': 'github:numtide/nix-filter/c843418ecfd0344ecb85844b082ff5675e02c443' (2023-12-04) → 'github:numtide/nix-filter/3449dc925982ad46246cfc36469baf66e1b64f17' (2024-01-15) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/eabe8d3eface69f5bb16c18f8662a702f50c20d5' (2024-01-09) → 'github:NixOS/nixpkgs/e0629618b4b419a47e2c8a3cab223e2a7f3a8f97' (2024-01-15)
Flake lock file updates: • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/e0629618b4b419a47e2c8a3cab223e2a7f3a8f97' (2024-01-15) → 'github:NixOS/nixpkgs/b06ff4bf8f4ad900fe0c2a61fc2946edc3a84be7' (2024-01-18) • Updated input 'unblob-native': 'github:onekey-sec/unblob-native/e225550e8a3b58f0e508888ea05fca3b30d8f1e7' (2024-01-10) → 'github:onekey-sec/unblob-native/79dd6a6a5cecfe4b60f6f3e8448a6242f17b65dc' (2024-01-18) • Updated input 'unblob-native/advisory-db': 'github:rustsec/advisory-db/a5fb72de318a74eb69a2c241c0e46705684a35d0' (2023-12-21) → 'github:rustsec/advisory-db/33acf3edda9c7b8a991b3a8007c1b2282932f262' (2024-01-17) • Updated input 'unblob-native/crane': 'github:ipetkov/crane/0efe36f9232e0961512572883ba9c995aa1f54b1' (2024-01-03) → 'github:ipetkov/crane/742170d82cd65c925dcddc5c3d6185699fbbad08' (2024-01-18) • Updated input 'unblob-native/flake-utils': 'github:numtide/flake-utils/4022d587cbbfd70fe950c1e2083a02621806a725' (2023-12-04) → 'github:numtide/flake-utils/1ef2e671c3b0c19053962c07dbda38332dcebf26' (2024-01-15) • Updated input 'unblob-native/nix-filter': 'github:numtide/nix-filter/c843418ecfd0344ecb85844b082ff5675e02c443' (2023-12-04) → 'github:numtide/nix-filter/3449dc925982ad46246cfc36469baf66e1b64f17' (2024-01-15)
Flake lock file updates: • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/b06ff4bf8f4ad900fe0c2a61fc2946edc3a84be7' (2024-01-18) → 'github:NixOS/nixpkgs/5f5210aa20e343b7e35f40c033000db0ef80d7b9' (2024-01-22) • Updated input 'pyperscan': 'github:vlaci/pyperscan/76f07b61c91309084a121bee292c138a8f96474a' (2023-12-15) → 'github:vlaci/pyperscan/6bb577e885bd03589af261291c9cb80b6e074b66' (2024-01-19)
cd1bcbd
to
9c687c5
Compare
Automated changes by the update-flake-lock GitHub Action.
Running GitHub Actions on this PR
GitHub Actions will not run workflows on pull requests which are opened by a GitHub Action.
To run GitHub Actions workflows on this PR, run: