Merge pull request #1128 from onekey-sec/update-ubi-reader

chore(deps): upgrade ubi-reader to 0.8.10

Author: vlaci

flake.nix

@@ -36,18 +36,42 @@
         "aarch64-darwin"
       ];
 
+      # Temporary patches for nixpkgs required for current unblob
+      nixpkgsPatches = [
+        # ubi_reader: 0.8.9 -> 0.8.10
+        {
+          url = "https://github.com/NixOS/nixpkgs/commit/a3b3188908f87f3c2bafd6b66ab2c0df2c059fa9.patch";
+          hash = "sha256-MYP5q7KwbGzx01GYxvb4YwkLPV/aSzbI4Cbp+olw9a0=";
+        }
+      ];
+
       # Helper function to generate an attrset '{ x86_64-linux = f "x86_64-linux"; ... }'.
       forAllSystems = nixpkgs.lib.genAttrs supportedSystems;
 
       # Nixpkgs instantiated for supported system types.
       nixpkgsFor = forAllSystems (
         system:
-        import nixpkgs {
-          inherit system;
-          overlays = [
-            self.overlays.default
-          ];
-        }
+        let
+          importPkgs =
+            nixpkgs:
+            import nixpkgs {
+              inherit system;
+              overlays = [
+                self.overlays.default
+              ];
+            };
+
+          bootstrapPkgs = importPkgs nixpkgs;
+
+          patchedNixpkgs = bootstrapPkgs.applyPatches {
+            name = "nixpkgs-patched";
+            src = nixpkgs;
+            patches = map bootstrapPkgs.fetchpatch nixpkgsPatches;
+          };
+
+          finalPkgs = importPkgs patchedNixpkgs;
+        in
+        if builtins.length nixpkgsPatches != 0 then finalPkgs else bootstrapPkgs
       );
     in
     {

tests/integration/archive/dlink/encrpted_img/__output__/fruits.dec_extract/fruits.dec.decrypted_extract/img-1180426539_vol-apple.ubifs

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e0212dd24f80c73b10e6ef2853fdf73d3a8ca27103cfcdb8cee4360f0814057a
-size 896
+oid sha256:6181259c6b2ca629a56920b422e9a8f212a4d0bcead923df92dbd66fbb7e1c30
+size 7

tests/integration/archive/dlink/shrs/__output__/sample.bin_extract/sample.bin.decrypted_extract/img-1180426539_vol-apple.ubifs

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e0212dd24f80c73b10e6ef2853fdf73d3a8ca27103cfcdb8cee4360f0814057a
-size 896
+oid sha256:6181259c6b2ca629a56920b422e9a8f212a4d0bcead923df92dbd66fbb7e1c30
+size 7

tests/integration/filesystem/ubi/ubi/__output__/fruits.ubi_extract/img-1180426539_vol-apple.ubifs

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e0212dd24f80c73b10e6ef2853fdf73d3a8ca27103cfcdb8cee4360f0814057a
-size 896
+oid sha256:6181259c6b2ca629a56920b422e9a8f212a4d0bcead923df92dbd66fbb7e1c30
+size 7