From 31b7ddd122d54c36edb101d2c8bdf230651f27d4 Mon Sep 17 00:00:00 2001 From: Ophestra Date: Sun, 13 Apr 2025 03:23:28 +0900 Subject: fst: improve config The config struct more or less "grew" to what it is today. This change moves things around to make more sense and fixes nonsensical comments describing obsolete behaviour. Signed-off-by: Ophestra --- cmd/fpkg/test/foot.nix | 2 +- cmd/fpkg/test/test.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'cmd/fpkg/test') diff --git a/cmd/fpkg/test/foot.nix b/cmd/fpkg/test/foot.nix index 34469da0..76b677ac 100644 --- a/cmd/fpkg/test/foot.nix +++ b/cmd/fpkg/test/foot.nix @@ -10,7 +10,7 @@ buildPackage { name = "foot"; inherit (foot) version; - app_id = 2; + identity = 2; id = "org.codeberg.dnkl.foot"; modules = [ diff --git a/cmd/fpkg/test/test.py b/cmd/fpkg/test/test.py index 7d4e0d58..641062f2 100644 --- a/cmd/fpkg/test/test.py +++ b/cmd/fpkg/test/test.py @@ -65,8 +65,8 @@ def check_state(name, enablements): if len(config['args']) != 1 or not (config['args'][0].startswith("/nix/store/")) or f"fortify-{name}-" not in (config['args'][0]): raise Exception(f"unexpected args {instance['config']['args']}") - if config['confinement']['enablements'] != enablements: - raise Exception(f"unexpected enablements {instance['config']['confinement']['enablements']}") + if config['enablements'] != enablements: + raise Exception(f"unexpected enablements {instance['config']['enablements']}") start_all() -- cgit v1.3.1