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

vlaci · web-flow · commit 1f6ab0ad7ccb · 2023-04-03T12:52:11.000+02:00
Update nix &amp; add development dependencies in shell environment
diff --git a/flake.lock b/flake.lock
diff --git a/nix/unblob/default.nix b/nix/unblob/default.nix
@@ -112,7 +112,7 @@ let
     ];
 
     preBuild = ''
-      cp -r --no-preserve=mode ${rust-module} build
+      cp -r --no-preserve=mode ${rust-module}/unblob .
     '';
 
     makeWrapperArgs = [
diff --git a/nix/unblob/rust-module.nix b/nix/unblob/rust-module.nix
@@ -52,6 +52,6 @@ craneLib.mkCargoDerivation {
   '';
   installPhaseCommand = ''
     mkdir -p $out
-    cp -a build/* $out
+    cp -a build/lib.*/* $out
   '';
 }
diff --git a/shell.nix b/shell.nix
@@ -13,6 +13,10 @@ mkShell {
   packages = [
     unblob
     unblob.runtimeDeps
+    ruff
+    pyright
+    python3Packages.pytest
+    python3Packages.pytest-cov
     poetry
     lzo
     update

Original file line number	Diff line number	Diff line change
`@@ -52,6 +52,6 @@ craneLib.mkCargoDerivation {`
`52`	`52`	`'';`
`53`	`53`	`installPhaseCommand = ''`
`54`	`54`	`mkdir -p $out`
`55`		`- cp -a build/* $out`
	`55`	`+ cp -a build/lib./ $out`
`56`	`56`	`'';`
`57`	`57`	`}`