diff --git a/flake.nix b/flake.nix index 4f716cb..f7f2e54 100644 --- a/flake.nix +++ b/flake.nix @@ -16,7 +16,7 @@ ]; }; - rust-nightly = pkgs.rust-bin.fromRustupToolchainFile ./rust/rust-toolchain.toml; + rust-nightly = pkgs.rust-bin.fromRustupToolchainFile ./rust/lanzaboote/rust-toolchain.toml; naersk-stable = pkgs.callPackage naersk {}; naersk-nightly = pkgs.callPackage naersk { @@ -58,14 +58,14 @@ ''; lanzaboote = naersk-nightly.buildPackage { - src = ./rust; + src = ./rust/lanzaboote; cargoBuildOptions = old: old ++ [ "--target x86_64-unknown-uefi" ]; }; lanzatool = naersk-stable.buildPackage { - src = ./lanzatool; + src = ./rust/lanzatool; }; osrel = pkgs.writeText "lanzaboote-osrel" '' diff --git a/rust/.cargo/config b/rust/lanzaboote/.cargo/config similarity index 100% rename from rust/.cargo/config rename to rust/lanzaboote/.cargo/config diff --git a/rust/Cargo.lock b/rust/lanzaboote/Cargo.lock similarity index 100% rename from rust/Cargo.lock rename to rust/lanzaboote/Cargo.lock diff --git a/rust/Cargo.toml b/rust/lanzaboote/Cargo.toml similarity index 100% rename from rust/Cargo.toml rename to rust/lanzaboote/Cargo.toml diff --git a/rust/rust-toolchain.toml b/rust/lanzaboote/rust-toolchain.toml similarity index 100% rename from rust/rust-toolchain.toml rename to rust/lanzaboote/rust-toolchain.toml diff --git a/rust/src/main.rs b/rust/lanzaboote/src/main.rs similarity index 100% rename from rust/src/main.rs rename to rust/lanzaboote/src/main.rs diff --git a/lanzatool/Cargo.lock b/rust/lanzatool/Cargo.lock similarity index 100% rename from lanzatool/Cargo.lock rename to rust/lanzatool/Cargo.lock diff --git a/lanzatool/Cargo.toml b/rust/lanzatool/Cargo.toml similarity index 100% rename from lanzatool/Cargo.toml rename to rust/lanzatool/Cargo.toml diff --git a/lanzatool/src/cli.rs b/rust/lanzatool/src/cli.rs similarity index 100% rename from lanzatool/src/cli.rs rename to rust/lanzatool/src/cli.rs diff --git a/lanzatool/src/crypto.rs b/rust/lanzatool/src/crypto.rs similarity index 100% rename from lanzatool/src/crypto.rs rename to rust/lanzatool/src/crypto.rs diff --git a/lanzatool/src/main.rs b/rust/lanzatool/src/main.rs similarity index 100% rename from lanzatool/src/main.rs rename to rust/lanzatool/src/main.rs