diff options
| author | Benjamin Staffin <benley@gmail.com> | 2016-03-08 15:58:36 -0800 |
|---|---|---|
| committer | Benjamin Staffin <benley@gmail.com> | 2016-03-08 15:58:36 -0800 |
| commit | d92bb56f74f216f90d111e79afa39ef6e7888900 (patch) | |
| tree | c5c795274e5de855ad93eb46e2b5dec58a711e9c /pkgs | |
| parent | 956bbd45f7ea0046a49605d6c514d8f24610dd96 (diff) | |
| parent | ce74aac132fd460674ef58b9324c8574e9c82f4b (diff) | |
Merge pull request #13769 from aneeshusa/openssh-decouple-gssapi-from-kerberos
openssh: decouple gssapi patch from kerberos
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/tools/networking/openssh/default.nix | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index 4a1efbb033569..08a3dbc58f7e2 100644 --- a/pkgs/tools/networking/openssh/default.nix +++ b/pkgs/tools/networking/openssh/default.nix @@ -2,12 +2,13 @@ , etcDir ? null , hpnSupport ? false , withKerberos ? false -, withGssapiPatches ? withKerberos +, withGssapiPatches ? false , kerberos , linkOpenssl? true }: assert withKerberos -> kerberos != null; +assert withGssapiPatches -> withKerberos; let @@ -17,13 +18,15 @@ let }; gssapiSrc = fetchpatch { - url = "http://anonscm.debian.org/cgit/pkg-ssh/openssh.git/plain/debian/patches/gssapi.patch?h=debian/7.1p2-2"; - sha256 = "05nsch879nlpyyiwm240wlq9rasy71j9d03j1rfi8kp865zhjfbm"; + url = "https://anonscm.debian.org/cgit/pkg-ssh/openssh.git/plain/debian/patches/gssapi.patch?id=46961f5704f8e86cea3e99253faad55aef4d8f35"; + sha256 = "01mf2vx1gavypbdx06mcbmcrkm2smff0h3jfmr61k6h6j3xk88y5"; }; in with stdenv.lib; stdenv.mkDerivation rec { + # Please ensure that openssh_with_kerberos still builds when + # bumping the version here! name = "openssh-7.2p1"; src = fetchurl { |