pkgs/openssh: cleanup and invert the check wording
This commit is contained in:
parent
0c83b0fc68
commit
89d7f4f79b
@ -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 = [
|
||||
|
@ -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 =
|
||||
[
|
||||
|
Loading…
Reference in New Issue
Block a user