From d712fa2490cf8f7e8546b7fa54e723cc1bdb5f96 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Wed, 16 Oct 2024 11:40:59 +0200 Subject: [PATCH] image-podvm: drop assertion supression This isn't needed any longer. Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- packages/nixos/image.nix | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/packages/nixos/image.nix b/packages/nixos/image.nix index 644cdbcd39..a62342e0f6 100644 --- a/packages/nixos/image.nix +++ b/packages/nixos/image.nix @@ -1,12 +1,7 @@ # Copyright 2024 Edgeless Systems GmbH # SPDX-License-Identifier: AGPL-3.0-only -{ - config, - lib, - pkgs, - ... -}: +{ config, pkgs, ... }: { # We build the image with systemd-repart, which integrates well @@ -66,9 +61,4 @@ }; }; }; - - # TODO(msanft): fix upstream, patch available here: - # https://github.com/edgelesssys/nixpkgs/commit/7d68972f2a145b6705b901d3ec7eebb235b7aca8?diff=split&w=1#diff-b636d2e49e098b09a6f1b276ad981f0772cc9f93b23c3d23b3bdff54cd8fb287R702-R703 - # But we don't want to use a forked nixpkgs. - assertions = lib.mkForce [ ]; }