Unverified Commit c7411f7d authored by Jörg Thalheim's avatar Jörg Thalheim Committed by GitHub
Browse files

Merge pull request #277579 from nikstur/openssh-tests-in-separate-derivation 

openssh: put tests into passthru
parents 3364848e 86775175

nixos/release-small.nix

+2 −0
Original line number Diff line number Diff line
@@ -78,6 +78,7 @@ in rec { 
      nginx

      nodejs

      openssh

      opensshTest

      php

      postgresql

      python
@@ -139,6 +140,7 @@ in rec { 
        "nixos.tests.simple"

        "nixpkgs.jdk"

        "nixpkgs.tests-stdenv-gcc-stageCompare"

        "nixpkgs.opensshTest"

      ])

    ];

  };

pkgs/tools/networking/openssh/common.nix

+8 −4
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ 
, isNixos ? stdenv.hostPlatform.isLinux

}:



stdenv.mkDerivation {

stdenv.mkDerivation (finalAttrs: {

  inherit pname version src;



  patches = [
@@ -111,7 +111,7 @@ stdenv.mkDerivation { 


  hardeningEnable = [ "pie" ];



  doCheck = true;

  doCheck = false;

  enableParallelChecking = false;

  nativeCheckInputs = [ openssl ] ++ lib.optional (!stdenv.isDarwin) hostname;

  preCheck = lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) ''
@@ -181,7 +181,11 @@ stdenv.mkDerivation { 
    inherit withKerberos;

    tests = {

      borgbackup-integration = nixosTests.borgbackup;

      openssh = nixosTests.openssh;

      nixosTest = nixosTests.openssh;

      openssh = finalAttrs.finalPackage.overrideAttrs (previousAttrs: {

        pname = previousAttrs.pname + "-test";

        doCheck = true;

      });

    };

  };
@@ -194,4 +198,4 @@ stdenv.mkDerivation { 
    maintainers = (extraMeta.maintainers or []) ++ (with maintainers; [ eelco aneeshusa ]);

    mainProgram = "ssh";

  } // extraMeta;

}
 
})

pkgs/top-level/all-packages.nix

+2 −0
Original line number Diff line number Diff line
@@ -11235,6 +11235,8 @@ with pkgs; 
    etcDir = "/etc/ssh";

  };













  opensshTest = openssh.tests.openssh;



























  opensshWithKerberos = openssh.override {















    withKerberos = true;















  };