Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 5e3c7cb65c31
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: ac522cbe95c9
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Oct 6, 2017

  1. openssh: 7.5p1 -> 7.6p1 

    Release notes are available at https://www.openssh.com/txt/release-7.6.
Mostly a bugfix release, no major backwards-incompatible changes.
    @aneeshusa
    aneeshusa committed Oct 6, 2017

    Partially verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    We cannot verify signatures from co-authors, and some of the co-authors attributed to this commit require their commits to be signed.
    Copy the full SHA
    d473ef2 View commit details

Commits on Nov 11, 2017

  1. Merge pull request #30137 from aneeshusa/update-openssh-to-7.6p1 

    openssh: 7.5p1 -> 7.6p1
    @orivej
    orivej authored Nov 11, 2017
    Copy the full SHA
    ac522cb View commit details
Showing with 6 additions and 6 deletions.
  1. +6 −6 pkgs/tools/networking/openssh/default.nix
12 changes: 6 additions & 6 deletions pkgs/tools/networking/openssh/default.nix
View file
Original file line number Diff line number Diff line change
@@ -13,11 +13,11 @@ assert withGssapiPatches -> withKerberos;
let

# **please** update this patch when you update to a new openssh release.
gssapiSrc = fetchpatch {
gssapiPatch = fetchpatch {
name = "openssh-gssapi.patch";
url = "https://anonscm.debian.org/cgit/pkg-ssh/openssh.git/plain/debian"
+ "/patches/gssapi.patch?id=db2122d97eb1ecdd8d99b7bf79b0dd2b5addfd92";
sha256 = "1rw10pmvjw55521ys59x1kabvbvmla506znakwwjijggdsakvsjm";
+ "/patches/gssapi.patch?id=1e0d55f9163793742d20eaadd4784db16fd3459d";
sha256 = "130phj87q87p9crigd6852nnaqsqkfg09h45a32lk4524h9kkxgb";
};

in
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
# Please ensure that openssh_with_kerberos still builds when
# bumping the version here!
name = "openssh-${version}";
version = "7.5p1";
version = if hpnSupport then "7.5p1" else "7.6p1";

src = if hpnSupport then
fetchurl {
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
else
fetchurl {
url = "mirror://openbsd/OpenSSH/portable/${name}.tar.gz";
sha256 = "1w7rb5gbrikxdkp8w7zxnci4549gk4bw1lml01s59w5rzb2y6ilq";
sha256 = "08qpsb8mrzcx8wgvz9insiyvq7sbg26yj5nvl2m5n57yvppcl8x3";
};

patches =
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
# See discussion in https://github.com/NixOS/nixpkgs/pull/16966
./dont_create_privsep_path.patch
]
++ optional withGssapiPatches gssapiSrc;
++ optional withGssapiPatches gssapiPatch;

postPatch =
# On Hydra this makes installation fail (sometimes?),