qbit/xin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

pkgs/openssh: cleanup and invert the check wording

Browse Source
This commit is contained in:
Aaron Bieber 2024-03-08 10:19:27 -07:00
parent 0c83b0fc68
commit 89d7f4f79b
No known key found for this signature in database
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
default.nix
View File

@ -3,7 +3,6 @@
, options , options
, pkgs , pkgs
, isUnstable , isUnstable
, xinlib
, ... , ...
}: }:
let 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 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; }; 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 in
{ {
imports = [ imports = [

10
pkgs/openssh.nix
View File

@ -14,7 +14,6 @@
, stdenv , stdenv
, withFIDO ? stdenv.hostPlatform.isUnix && !stdenv.hostPlatform.isMusl , withFIDO ? stdenv.hostPlatform.isUnix && !stdenv.hostPlatform.isMusl
, withPAM ? stdenv.hostPlatform.isLinux , withPAM ? stdenv.hostPlatform.isLinux
, xinlib
, zlib , zlib
, ... , ...
}: }:
@ -22,9 +21,9 @@ let
inherit (builtins) readFile fromJSON; inherit (builtins) readFile fromJSON;
verStr = fromJSON (readFile ./openssh/version.json); verStr = fromJSON (readFile ./openssh/version.json);
hostStr = lib.strings.concatStrings [ hostStr = lib.strings.concatStrings [
"CI not configured on '" "CI configured on '"
config.networking.hostName config.networking.hostName
"': skipping OpenSSH tests" "': running OpenSSH tests"
]; ];
in in
stdenv.mkDerivation { stdenv.mkDerivation {
@ -40,8 +39,9 @@ stdenv.mkDerivation {
doCheck = doCheck =
if config.xinCI.enable if config.xinCI.enable
then then
true (lib.warn hostStr true)
else (lib.warn hostStr false); else
true;
patches = patches =
[ [