From 1087b3eb0809c7d67775e271b81e1e65c673d9b5 Mon Sep 17 00:00:00 2001 From: nikstur Date: Thu, 4 Jun 2026 15:37:22 +0200 Subject: [PATCH 1/2] gnupgMinimal: init This used to be a non-exposed part of the systemd derivation. However, in #509324 this was removed. Re-add this to use it for systemd-import and systemd-sysupdate to provide a minimal gnupg without bash. This fixes the bashless tests. --- pkgs/top-level/all-packages.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0e2defb6566c..733d399f71dd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2358,6 +2358,10 @@ with pkgs; pinentry = if stdenv.hostPlatform.isDarwin then pinentry_mac else pinentry-gtk2; }; gnupg = gnupg24; + gnupgMinimal = gnupg.override { + enableMinimal = true; + guiSupport = false; + }; gnused = callPackage ../tools/text/gnused { }; From 603f171aa868b2281aed24fdca4f62be96052b96 Mon Sep 17 00:00:00 2001 From: nikstur Date: Thu, 4 Jun 2026 15:41:39 +0200 Subject: [PATCH 2/2] nixos/systemd: gnupg -> gnupgMinimal This fixes the bashless tests as gnupgMinimal doest not depend on bash. --- nixos/modules/system/boot/systemd.nix | 2 +- nixos/modules/system/boot/systemd/sysupdate.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index 7227ac4277e7..0220a052fdff 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -808,7 +808,7 @@ in systemd.targets.remote-fs.unitConfig.X-StopOnReconfiguration = true; systemd.services.systemd-importd = lib.mkIf cfg.package.withImportd { environment = proxy_env; - path = [ pkgs.gnupg ]; + path = [ pkgs.gnupgMinimal ]; }; systemd.services.systemd-pstore.wantedBy = [ "sysinit.target" ]; # see #81138 diff --git a/nixos/modules/system/boot/systemd/sysupdate.nix b/nixos/modules/system/boot/systemd/sysupdate.nix index 3fa8dc212ea2..91a165d7d5ab 100644 --- a/nixos/modules/system/boot/systemd/sysupdate.nix +++ b/nixos/modules/system/boot/systemd/sysupdate.nix @@ -138,7 +138,7 @@ in systemd.services.systemd-sysupdated = { aliases = [ "dbus-org.freedesktop.sysupdate1.service" ]; - path = [ pkgs.gnupg ]; + path = [ pkgs.gnupgMinimal ]; }; systemd.timers = {