alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Pull requests Activity

Merge pull request #13769 from aneeshusa/openssh-decouple-gssapi-from-kerberos

Browse source 
openssh: decouple gssapi patch from kerberos
This commit is contained in:
Benjamin Staffin 2016-03-08 15:58:36 -08:00
commit d92bb56f74
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
pkgs/tools/networking/openssh/default.nix
View file

@ -2,12 +2,13 @@
, etcDir ? null , etcDir ? null
, hpnSupport ? false , hpnSupport ? false
, withKerberos ? false , withKerberos ? false
, withGssapiPatches ? withKerberos , withGssapiPatches ? false
, kerberos , kerberos
, linkOpenssl? true , linkOpenssl? true
}: }:
assert withKerberos -> kerberos != null; assert withKerberos -> kerberos != null;
assert withGssapiPatches -> withKerberos;
let let
@ -17,13 +18,15 @@ let
}; };
gssapiSrc = fetchpatch { gssapiSrc = fetchpatch {
url = "http://anonscm.debian.org/cgit/pkg-ssh/openssh.git/plain/debian/patches/gssapi.patch?h=debian/7.1p2-2"; url = "https://anonscm.debian.org/cgit/pkg-ssh/openssh.git/plain/debian/patches/gssapi.patch?id=46961f5704f8e86cea3e99253faad55aef4d8f35";
sha256 = "05nsch879nlpyyiwm240wlq9rasy71j9d03j1rfi8kp865zhjfbm"; sha256 = "01mf2vx1gavypbdx06mcbmcrkm2smff0h3jfmr61k6h6j3xk88y5";
}; };
in in
with stdenv.lib; with stdenv.lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
# Please ensure that openssh_with_kerberos still builds when
# bumping the version here!
name = "openssh-7.2p1"; name = "openssh-7.2p1";
src = fetchurl { src = fetchurl {