Merge pull request #1167 from onekey-sec/7zip-nix

chore(deps): Downgrade 7zip to v16.02 in nix packaging

Author: qkaiser

.envrc

@@ -3,7 +3,7 @@
 source_env_if_exists .envrc.user
 
 if ${UNBLOB_USE_DEVENV:-true}; then
-    watch_file flake.nix flake.lock devenv.nix
+    watch_file *.nix flake.lock
     use nix \
         --option extra-substituters "https://unblob.cachix.org" \
         --option extra-trusted-public-keys "unblob.cachix.org-1:5kWA6DwOg176rSqU8TOTBXWxsDB4LoCMfGfTgL5qCAE="

.pre-commit-config.yaml

@@ -40,6 +40,17 @@ repos:
           - nix-command flakes
           - --accept-flake-config
           - fmt
+      - id: statix
+        name: Lint Nix (statix)
+        types: [nix]
+        pass_filenames: false
+        language: system
+        entry: bash -c 'command -v nix && statix fix "$@" || echo "skipping statix"'
+      - id: deadnix
+        name: Lint Nix (deadnix)
+        types: [nix]
+        language: system
+        entry: bash -c 'command -v nix && deadnix --edit "$@" || echo "skipping deadnix"'
       - id: taplo-format
         name: Format TOML (taplo)
         language: system

flake.nix

@@ -109,6 +109,9 @@
               python3Packages.patchVenvShellHook
               python3Packages.autoPatchelfVenvShellHook
 
+              deadnix
+              statix
+
               cargo
               rustc
 

overlay.nix

@@ -8,5 +8,26 @@ final: prev:
     nativeCheckInputs = (super.nativeCheckInputs or [ ]) ++ [ final.which ];
   });
 
+  p7zip16 = prev.p7zip.overrideAttrs (super: rec {
+    pname = "p7zip16";
+    version = "16.02";
+    srcs = [
+      (final.fetchurl {
+        url = "mirror://sourceforge/p7zip/p7zip_${version}_src_all.tar.bz2";
+        sha256 = "5eb20ac0e2944f6cb9c2d51dd6c4518941c185347d4089ea89087ffdd6e2341f";
+      })
+      (final.fetchurl {
+        url = "http://deb.debian.org/debian/pool/main/p/p7zip/p7zip_${version}+dfsg-8.debian.tar.xz";
+        sha256 = "sha256-ASF9yhZnrw3kiTWlHcRqrUQubryseZ1xQQG37fllHrU=";
+      })
+    ];
+    sourceRoot = "p7zip_${version}";
+    nativeBuildInputs = (super.nativeBuildInputs or [ ]) ++ [ final.quilt ];
+    prePatch = ''
+      export QUILT_PATCHES=../debian/patches
+      quilt push -a
+    '';
+  });
+
   unblob = final.callPackage ./package.nix { };
 }

package.nix

@@ -1,15 +1,14 @@
 {
   lib,
   python3,
-  fetchFromGitHub,
   makeWrapper,
   e2fsprogs-nofortify,
   erofs-utils,
   jefferson,
   lz4,
   lziprecover,
   lzop,
-  p7zip,
+  p7zip16,
   nix-filter,
   sasquatch,
   sasquatch-v4be,
@@ -29,7 +28,7 @@ let
     jefferson
     lziprecover
     lzop
-    p7zip
+    p7zip16
     sasquatch
     sasquatch-v4be
     ubi_reader
@@ -38,10 +37,10 @@ let
     zstd
     lz4
   ];
-  pyproject_toml = (builtins.fromTOML (builtins.readFile ./pyproject.toml));
-  version = pyproject_toml.project.version;
+  pyproject_toml = builtins.fromTOML (builtins.readFile ./pyproject.toml);
+  inherit (pyproject_toml.project) version;
 in
-python3.pkgs.buildPythonApplication rec {
+python3.pkgs.buildPythonApplication {
   pname = "unblob";
   pyproject = true;
   disabled = python3.pkgs.pythonOlder "3.9";