commit
94a1cf055a
|
@ -126,7 +126,7 @@ nixosConfigurations = {
|
||||||
pkgs.sbctl
|
pkgs.sbctl
|
||||||
];
|
];
|
||||||
|
|
||||||
# Lanzaboote currently replaces the sytemd-boot module.
|
# Lanzaboote currently replaces the systemd-boot module.
|
||||||
# This setting is usually set to true in configuration.nix
|
# This setting is usually set to true in configuration.nix
|
||||||
# generated at installation time. So we force it to false
|
# generated at installation time. So we force it to false
|
||||||
# for now.
|
# for now.
|
||||||
|
|
|
@ -14,7 +14,7 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
# We only have this input to pass it to other dependencies and
|
# We only have this input to pass it to other dependencies and
|
||||||
# avoid having mulitple versions in our dependencies.
|
# avoid having multiple versions in our dependencies.
|
||||||
flake-utils.url = "github:numtide/flake-utils";
|
flake-utils.url = "github:numtide/flake-utils";
|
||||||
|
|
||||||
crane = {
|
crane = {
|
||||||
|
@ -166,6 +166,7 @@
|
||||||
|
|
||||||
settings.hooks = {
|
settings.hooks = {
|
||||||
nixpkgs-fmt.enable = true;
|
nixpkgs-fmt.enable = true;
|
||||||
|
typos.enable = true;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -25,7 +25,7 @@ in
|
||||||
};
|
};
|
||||||
pkiBundle = mkOption {
|
pkiBundle = mkOption {
|
||||||
type = types.nullOr types.path;
|
type = types.nullOr types.path;
|
||||||
description = "PKI bundle containg db, PK, KEK";
|
description = "PKI bundle containing db, PK, KEK";
|
||||||
};
|
};
|
||||||
publicKeyFile = mkOption {
|
publicKeyFile = mkOption {
|
||||||
type = types.path;
|
type = types.path;
|
||||||
|
|
|
@ -149,7 +149,7 @@ mod tests {
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn keep_used_dirctory_with_used_and_unused_file() -> Result<()> {
|
fn keep_used_directory_with_used_and_unused_file() -> Result<()> {
|
||||||
let tmpdir = tempfile::tempdir()?;
|
let tmpdir = tempfile::tempdir()?;
|
||||||
let rootdir = create_dir(tmpdir.path().join("root"))?;
|
let rootdir = create_dir(tmpdir.path().join("root"))?;
|
||||||
|
|
||||||
|
|
|
@ -126,7 +126,7 @@ fn read_build_time(path: &Path) -> Result<String> {
|
||||||
/// A link pointing to a generation.
|
/// A link pointing to a generation.
|
||||||
///
|
///
|
||||||
/// Can be built from a symlink in /nix/var/nix/profiles/ alone because the name of the
|
/// Can be built from a symlink in /nix/var/nix/profiles/ alone because the name of the
|
||||||
/// symlink enocdes the version number.
|
/// symlink encodes the version number.
|
||||||
#[derive(Debug)]
|
#[derive(Debug)]
|
||||||
pub struct GenerationLink {
|
pub struct GenerationLink {
|
||||||
pub version: u64,
|
pub version: u64,
|
||||||
|
|
|
@ -196,7 +196,7 @@ fn stub_offset(binary: &Path) -> Result<u64> {
|
||||||
|
|
||||||
let image_base = image_base(&pe);
|
let image_base = image_base(&pe);
|
||||||
|
|
||||||
// The Virtual Memory Addresss (VMA) is relative to the image base, aka the image base
|
// The Virtual Memory Address (VMA) is relative to the image base, aka the image base
|
||||||
// needs to be added to the virtual address to get the actual (but still virtual address)
|
// needs to be added to the virtual address to get the actual (but still virtual address)
|
||||||
Ok(u64::from(
|
Ok(u64::from(
|
||||||
pe.sections
|
pe.sections
|
||||||
|
|
Loading…
Reference in New Issue