diff --git a/flake.lock b/flake.lock index fa95ed5d6b..48dcd47c7d 100644 --- a/flake.lock +++ b/flake.lock @@ -10,11 +10,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1678152261, - "narHash": "sha256-cPRDxwygVMleiSEGELrvAiq9vYAN4c3KK/K4UEO13vU=", + "lastModified": 1680063688, + "narHash": "sha256-hVt0i96VjwxKb/PvPfxM2otfvz923b8JHQ/l5XWeDIM=", "owner": "ipetkov", "repo": "crane", - "rev": "5291dd0aa7a52d607fc952763ef60714e4c881d4", + "rev": "6736e8be8e451b49954213241360e3b72529e47f", "type": "github" }, "original": { @@ -101,11 +101,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1678298120, - "narHash": "sha256-iaV5xqgn29xy765Js3EoZePQyZIlLZA3pTYtTnKkejg=", + "lastModified": 1680030621, + "narHash": "sha256-qQa1NeS5Rvk2lgK5lSk986PC6I72yIHejzM8PFu+dHs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1e383aada51b416c6c27d4884d2e258df201bc11", + "rev": "402cc3633cc60dfc50378197305c984518b30773", "type": "github" }, "original": { diff --git a/nix/unblob/default.nix b/nix/unblob/default.nix index 3dfda36951..e71e662cf5 100644 --- 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 index 217929f75c..774ad7eebb 100644 --- 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 index bd7eaa5dec..02616768c2 100644 --- 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