From c99035ccef66bf6d08e33cc6be6d6c87474b140a Mon Sep 17 00:00:00 2001 From: nikstur Date: Mon, 3 Nov 2025 13:51:58 +0100 Subject: [PATCH 1/3] nixos/tests/nix-store-veritysetup: fix warnings --- nixos/tests/nix-store-veritysetup.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/tests/nix-store-veritysetup.nix b/nixos/tests/nix-store-veritysetup.nix index 3b6a5e6a734f..031e1260e947 100644 --- a/nixos/tests/nix-store-veritysetup.nix +++ b/nixos/tests/nix-store-veritysetup.nix @@ -18,7 +18,7 @@ partitions = { "nix-store" = { storePaths = [ config.system.build.toplevel ]; - stripNixStorePrefix = true; + nixStorePrefix = "/"; repartConfig = { Type = "linux-generic"; Label = "nix-store"; @@ -89,7 +89,7 @@ "-f", "qcow2", "-b", - "${nodes.machine.system.build.image}/${nodes.machine.image.repart.imageFile}", + "${nodes.machine.system.build.image}/${nodes.machine.image.fileName}", "-F", "raw", tmp_disk_image.name, From 51989ac4bafe4b76ef525f74544b5399340677fc Mon Sep 17 00:00:00 2001 From: nikstur Date: Mon, 3 Nov 2025 13:52:20 +0100 Subject: [PATCH 2/3] nix-store-veritysetup-generator: 0.1.0 -> 1.0.0 --- pkgs/by-name/ni/nix-store-veritysetup-generator/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ni/nix-store-veritysetup-generator/package.nix b/pkgs/by-name/ni/nix-store-veritysetup-generator/package.nix index 729ede08f014..746f24097372 100644 --- a/pkgs/by-name/ni/nix-store-veritysetup-generator/package.nix +++ b/pkgs/by-name/ni/nix-store-veritysetup-generator/package.nix @@ -7,13 +7,13 @@ rustPlatform.buildRustPackage rec { pname = "nix-store-veritysetup-generator"; - version = "0.1.0"; + version = "1.0.0"; src = fetchFromGitHub { owner = "nikstur"; repo = "nix-store-veritysetup-generator"; rev = version; - hash = "sha256-kQ+mFBnvxmEH2+z1sDaehGInEsBpfZu8LMAseGjZ3/I="; + hash = "sha256-RTGdcLn4zuZAcC1Td4gJcywIerCYyaD0JYz8g5ybmho="; }; sourceRoot = "${src.name}/rust"; From faa785b02291b95aceeab3c1e638c992a79189b0 Mon Sep 17 00:00:00 2001 From: nikstur Date: Mon, 3 Nov 2025 13:59:44 +0100 Subject: [PATCH 3/3] nix-store-veritysetup-generator: add VM test to passthru --- pkgs/by-name/ni/nix-store-veritysetup-generator/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/ni/nix-store-veritysetup-generator/package.nix b/pkgs/by-name/ni/nix-store-veritysetup-generator/package.nix index 746f24097372..bff81aff6347 100644 --- a/pkgs/by-name/ni/nix-store-veritysetup-generator/package.nix +++ b/pkgs/by-name/ni/nix-store-veritysetup-generator/package.nix @@ -3,6 +3,7 @@ rustPlatform, fetchFromGitHub, systemd, + nixosTests, }: rustPlatform.buildRustPackage rec { @@ -34,6 +35,10 @@ rustPlatform.buildRustPackage rec { stripAllList = [ "bin" ]; + passthru.tests = { + inherit (nixosTests) nix-store-veritysetup; + }; + meta = with lib; { description = "Systemd unit generator for a verity protected Nix Store"; homepage = "https://github.com/nikstur/nix-store-veritysetup-generator";