Merge pull request #458 from onekey-sec/update-nix

Update nix dependencies, build using Poetry 1.2.1

Author: qkaiser

default.nix

@@ -41,40 +41,46 @@ let
 
     # Python dependencies that need special care, like non-python
     # build dependencies
-    overrides = poetry2nix.overrides.withoutDefaults (self: super: {
-      python-lzo = super.python-lzo.overridePythonAttrs (_: {
-        buildInputs = [
-          lzo
-        ];
-      });
+    overrides = poetry2nix.overrides.withoutDefaults (self: super:
+      let
+        # Inject setuptools to dependencies that is required by many non-wheel distributed packages
+        overrideWithSetuptools = drv: overrides: (drv.overridePythonAttrs overrides).overridePythonAttrs (prev: {
+          buildInputs = prev.buildInputs or [ ] ++ [
+            self.setuptools
+          ];
+        });
+      in
+      {
+        python-lzo = overrideWithSetuptools super.python-lzo (_: {
+          buildInputs = [
+            lzo
+          ];
+        });
 
-      jefferson = super.jefferson.overridePythonAttrs (_: {
-        propagatedBuildInputs = [
-          # Use the _same_ version as unblob
-          self.cstruct
-          self.python-lzo
-        ];
-      });
+        jefferson = overrideWithSetuptools super.jefferson (_: {
+          propagatedBuildInputs = [
+            # Use the _same_ version as unblob
+            self.cstruct
+            self.python-lzo
+          ];
+        });
 
-      ubi_reader = super.ubi_reader.ovveridePythonAttrs (_: {
-        propagatedBuildInputs = [
-          # Use the _same_ version as unblob
-          self.python-lzo
-        ];
-      });
+        python-magic = overrideWithSetuptools (super.python-magic.override { preferWheel = false; }) (_: {
+          patchPhase = ''
+            substituteInPlace magic/loader.py --replace "find_library('magic')" "'${file}/lib/libmagic.so'"
+          '';
+        });
 
-      python-magic = (super.python-magic.override { preferWheel = false; }).overridePythonAttrs (_: {
-        patchPhase = ''
-          substituteInPlace magic/loader.py --replace "find_library('magic')" "'${file}/lib/libmagic.so'"
-        '';
-      });
+        hyperscan = super.hyperscan.overridePythonAttrs (_: {
+          buildInputs = [
+            hyperscan
+          ];
+        });
 
-      hyperscan = super.hyperscan.overridePythonAttrs (_: {
-        buildInputs = [
-          hyperscan
-        ];
+        arpy = overrideWithSetuptools super.arpy { };
+        yaffshiv = overrideWithSetuptools super.yaffshiv { };
+        ubi-reader = overrideWithSetuptools super.ubi-reader { };
       });
-    });
 
     python = python3;
 

flake.lock

@@ -3,6 +3,7 @@
 
   inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
   inputs.poetry2nix.url = "github:nix-community/poetry2nix";
+  inputs.poetry2nix.inputs.nixpkgs.follows = "nixpkgs";
 
   inputs.sasquatch.url = "github:onekey-sec/sasquatch";
   inputs.sasquatch.flake = false;
@@ -12,24 +13,23 @@
       system = "x86_64-linux";
       pkgs = import nixpkgs {
         inherit system;
-        overlays = [ self.overlay ];
+        overlays = [ self.overlays.default ];
       };
       inherit (pkgs) unblob;
     in
     {
-      overlay = nixpkgs.lib.composeManyExtensions [
+      overlays.default = nixpkgs.lib.composeManyExtensions [
         poetry2nix.overlay
         (import ./overlay.nix { inherit sasquatch; })
       ];
 
       packages.${system} = {
         inherit unblob;
         inherit (pkgs) sasquatch;
+        default = unblob;
       };
 
-      defaultPackage.${system} = unblob;
-
-      devShell.${system} = import ./shell.nix { inherit pkgs; };
+      devShells.${system}.default = import ./shell.nix { inherit pkgs; };
 
       legacyPackages.${system} = pkgs;
     };