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: b40fc3a56b51
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 8f0b3b1305c8
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Jan 4, 2020

  1. openssh_gssapi: fix build 

    Hydra build is failing[1] because of a hash-mismatch of the gss-api
patch from debian.

I updated the patch, and activated the `autoreconfHook` when building
gss support as well, otherwise the build would fail with the following
error:

```
ERROR: configure is out of date; please run autoreconf (and configure)
```

[1] https://hydra.nixos.org/build/109409845
    @Ma27
    Ma27 committed Jan 4, 2020
    Copy the full SHA
    8f0b3b1 View commit details
Showing with 4 additions and 8 deletions.
  1. +4 −8 pkgs/tools/networking/openssh/default.nix
12 changes: 4 additions & 8 deletions pkgs/tools/networking/openssh/default.nix
View file
Original file line number Diff line number Diff line change
@@ -12,10 +12,8 @@ let
# **please** update this patch when you update to a new openssh release.
gssapiPatch = fetchpatch {
name = "openssh-gssapi.patch";
url = "https://salsa.debian.org/ssh-team/openssh/raw/"
+ "e50a98bda787a3b9f53ed67bdccbbac0bde1f9ae"
+ "/debian/patches/gssapi.patch";
sha256 = "14j9cabb3gkhkjc641zbiv29mbvsmgsvis3fbj8ywsd21zc7m2hv";
url = "https://salsa.debian.org/ssh-team/openssh/raw/debian/1%258.1p1-2/debian/patches/gssapi.patch";
sha256 = "0zfxx46a5lpjp317z354yyswa2wvmb1pp5p0nxsbhsrzw94jvxsj";
};

in
@@ -61,11 +59,9 @@ stdenv.mkDerivation rec {
substituteInPlace Makefile.in --replace '$(INSTALL) -m 4711' '$(INSTALL) -m 0711'
'';

nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkgconfig ] ++ optional (hpnSupport || withGssapiPatches) autoreconfHook;
buildInputs = [ zlib openssl libedit pam ]
++ optional withKerberos kerberos
++ optional hpnSupport autoreconfHook
;
++ optional withKerberos kerberos;

preConfigure = ''
# Setting LD causes `configure' and `make' to disagree about which linker