hyperscan: replacing wrapper

.github/actions/setup-dependencies/action.yml

@@ -1,13 +1,13 @@
 inputs:
   python-version:
-    description: 'Python version to setup'
+    description: "Python version to setup"
     required: false
     default: 3.8
 runs:
   using: "composite"
   steps:
     - name: Install 3rd party from apt
-      run: sudo apt install e2fsprogs p7zip-full unar zlib1g-dev liblzo2-dev lz4 lzop lziprecover img2simg libhyperscan5 libhyperscan-dev zstd
+      run: sudo apt install e2fsprogs p7zip-full unar zlib1g-dev liblzo2-dev lz4 lzop lziprecover img2simg zstd
       shell: bash
 
     - name: Install sasquatch

Dockerfile

@@ -21,8 +21,6 @@ RUN apt-get update && apt-get install --no-install-recommends -y \
     xz-utils \
     zlib1g-dev \
     libmagic1 \
-    libhyperscan5 \
-    libhyperscan-dev \
     zstd
 RUN curl -L -o sasquatch_1.0_amd64.deb https://github.com/onekey-sec/sasquatch/releases/download/sasquatch-v1.0/sasquatch_1.0_amd64.deb \
     && dpkg -i sasquatch_1.0_amd64.deb \

default.nix

@@ -3,6 +3,7 @@
 , mkPoetryApp
 , poetry2nix
 , glibc
+, pyperscan
 , python3
 , rustPlatform
 , e2fsprogs
@@ -16,7 +17,6 @@
 , simg2img
 , unar
 , file
-, hyperscan
 , zstd
 }:
 
@@ -72,24 +72,11 @@ let
           '';
         });
 
-        hyperscan = super.hyperscan.overridePythonAttrs (_: {
-          buildInputs = [
-            hyperscan
-            self.poetry
-            self.setuptools
-          ];
-          nativeBuildInputs = [
-            pkg-config
-          ];
-
-          installPhase = ''
-            ${self.python.pythonForBuild.interpreter} -m pip install --no-build-isolation --no-index --prefix=$out  --ignore-installed --no-dependencies --no-cache .
-          '';
-        });
-
         arpy = overrideWithSetuptools super.arpy { };
         yaffshiv = overrideWithSetuptools super.yaffshiv { };
         ubi-reader = overrideWithSetuptools super.ubi-reader { };
+
+        inherit pyperscan;
       });
 
     python = python3;

flake.nix

@@ -4,11 +4,13 @@
   inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
   inputs.poetry2nix.url = "github:nix-community/poetry2nix";
   inputs.poetry2nix.inputs.nixpkgs.follows = "nixpkgs";
+  inputs.pyperscan.url = "github:vlaci/pyperscan";
+  inputs.pyperscan.inputs.nixpkgs.follows = "nixpkgs";
 
   inputs.sasquatch.url = "github:onekey-sec/sasquatch";
   inputs.sasquatch.flake = false;
 
-  outputs = { self, nixpkgs, poetry2nix, sasquatch }:
+  outputs = { self, nixpkgs, poetry2nix, pyperscan, sasquatch }:
     let
       system = "x86_64-linux";
       pkgs = import nixpkgs {
@@ -20,7 +22,7 @@
     {
       overlays.default = nixpkgs.lib.composeManyExtensions [
         poetry2nix.overlay
-        (import ./overlay.nix { inherit sasquatch; })
+        (import ./overlay.nix { inherit pyperscan sasquatch; })
       ];
 
       packages.${system} = {

overlay.nix

@@ -2,6 +2,7 @@ inputs: final: prev:
 
 {
   unblob = prev.callPackage ./. { };
+  pyperscan = prev.callPackage inputs.pyperscan.defaultPackage.${final.system} { };
   gnustep = prev.callPackage ./nix/gnustep { inherit (prev) gnustep; };
   sasquatch = prev.callPackage ./nix/sasquatch { inherit (prev) squashfsTools; src = inputs.sasquatch; };
   mkPoetryApp = prev.callPackage ./nix/poetry { };