diff --git a/default.nix b/default.nix index d9639e4..6289ba4 100644 --- a/default.nix +++ b/default.nix @@ -3,7 +3,6 @@ , options , pkgs , isUnstable -, xinlib , ... }: let @@ -16,7 +15,7 @@ let command="/run/current-system/sw/bin/xin-status",no-port-forwarding,no-X11-forwarding,no-agent-forwarding,no-pty ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIE9PIhQ+yWfBM2tEG+W8W8HXJXqISXif8BcPZHakKvLM xin-status ''; gosignify = pkgs.callPackage ./pkgs/gosignify.nix { inherit isUnstable; }; - myOpenSSH = pkgs.callPackage ./pkgs/openssh.nix { inherit config xinlib; }; + myOpenSSH = pkgs.callPackage ./pkgs/openssh.nix { inherit config; }; in { imports = [ diff --git a/pkgs/openssh.nix b/pkgs/openssh.nix index 58a9ef3..4db2bb3 100644 --- a/pkgs/openssh.nix +++ b/pkgs/openssh.nix @@ -14,7 +14,6 @@ , stdenv , withFIDO ? stdenv.hostPlatform.isUnix && !stdenv.hostPlatform.isMusl , withPAM ? stdenv.hostPlatform.isLinux -, xinlib , zlib , ... }: @@ -22,9 +21,9 @@ let inherit (builtins) readFile fromJSON; verStr = fromJSON (readFile ./openssh/version.json); hostStr = lib.strings.concatStrings [ - "CI not configured on '" + "CI configured on '" config.networking.hostName - "': skipping OpenSSH tests" + "': running OpenSSH tests" ]; in stdenv.mkDerivation { @@ -40,8 +39,9 @@ stdenv.mkDerivation { doCheck = if config.xinCI.enable then - true - else (lib.warn hostStr false); + (lib.warn hostStr true) + else + true; patches = [