pkgs/openssh: more simplification
- re-enable all the tests - always build with fido and no openssl
This commit is contained in:
parent
271b4f12a5
commit
3ee3c92ea4
@ -348,6 +348,7 @@
|
||||
inherit (spkgs) matrix-synapse;
|
||||
|
||||
xin = upkgs.callPackage ./bins/xin { inherit upkgs; };
|
||||
openssh = upkgs.callPackage ./pkgs/openssh.nix { inherit upkgs; };
|
||||
});
|
||||
|
||||
templates = {
|
||||
|
@ -1,5 +1,4 @@
|
||||
{ autoreconfHook
|
||||
, config
|
||||
, etcDir ? "/etc/ssh"
|
||||
, fetchFromGitHub
|
||||
, hostname
|
||||
@ -8,24 +7,14 @@
|
||||
, libfido2
|
||||
, libredirect
|
||||
, libressl
|
||||
, pam
|
||||
, pkg-config
|
||||
, stdenv
|
||||
, withFIDO ? stdenv.hostPlatform.isUnix
|
||||
, withPAM ? false
|
||||
, zlib
|
||||
, xinlib
|
||||
, ...
|
||||
}:
|
||||
let
|
||||
inherit (builtins) readFile fromJSON;
|
||||
inherit (xinlib) todo;
|
||||
verStr = fromJSON (readFile ./openssh/version.json);
|
||||
hostStr = lib.strings.concatStrings [
|
||||
"CI configured on '"
|
||||
config.networking.hostName
|
||||
"': running OpenSSH tests"
|
||||
];
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
pname = "openssh";
|
||||
@ -37,13 +26,6 @@ stdenv.mkDerivation {
|
||||
repo = "openssh-portable";
|
||||
};
|
||||
|
||||
doCheck =
|
||||
if config.xinCI.enable
|
||||
then
|
||||
(lib.warn hostStr true)
|
||||
else
|
||||
true;
|
||||
|
||||
patches =
|
||||
[
|
||||
./openssh/locale_archive.patch
|
||||
@ -64,10 +46,8 @@ stdenv.mkDerivation {
|
||||
nativeBuildInputs =
|
||||
[ autoreconfHook pkg-config ];
|
||||
buildInputs =
|
||||
[ zlib libressl libedit ]
|
||||
++ lib.optional withFIDO libfido2
|
||||
++ lib.optional withPAM pam;
|
||||
|
||||
[ zlib libedit libfido2 ];
|
||||
|
||||
preConfigure = ''
|
||||
# Setting LD causes `configure' and `make' to disagree about which linker
|
||||
# to use: `configure' wants `gcc', but `make' wants `ld'.
|
||||
@ -85,11 +65,9 @@ stdenv.mkDerivation {
|
||||
"--with-libedit=yes"
|
||||
"--disable-strip"
|
||||
"--disable-dsa-keys"
|
||||
"--without-openssl"
|
||||
(lib.withFeature withPAM "pam")
|
||||
"--with-security-key-builtin=yes"
|
||||
]
|
||||
++ lib.optional (etcDir != null) "--sysconfdir=${etcDir}"
|
||||
++ lib.optional withFIDO "--with-security-key-builtin=yes"
|
||||
++ lib.optional stdenv.isDarwin "--disable-libutil";
|
||||
|
||||
${
|
||||
@ -152,11 +130,11 @@ stdenv.mkDerivation {
|
||||
set -a; source ~/.ssh/environment.base; set +a
|
||||
'';
|
||||
|
||||
checkTarget = todo "t-exec test disabled in openssh" [ "unit" "file-tests" "interop-tests" ];
|
||||
checkTarget = [ "t-exec" "unit" "file-tests" "interop-tests" ];
|
||||
|
||||
installTargets = [ "install-nokeys" ];
|
||||
installFlags = [
|
||||
"sysconfdir=\${out}/etc/ssh"
|
||||
"sysconfdir=\${out}${etcDir}"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
Loading…
Reference in New Issue
Block a user