Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: b28be19c9add
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: d2eeac149def
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jun 25, 2020

  1. openssh: don’t include fido2 on musl 

    libselinux pulls in openssh transitively, so can’t use fido here

Fixes #89246

(cherry picked from commit 59616b2)
    @matthewbauer @nomeata
    matthewbauer authored and nomeata committed Jun 25, 2020
    Copy the full SHA
    ec75f82 View commit details

Commits on Jun 27, 2020

  1. Merge pull request #91470 from nomeata/release-20.03 

    openssh: don’t include fido2 on musl
    @marsam
    marsam authored Jun 27, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    d2eeac1 View commit details
Showing with 1 addition and 1 deletion.
  1. +1 −1 pkgs/tools/networking/openssh/default.nix
2 changes: 1 addition & 1 deletion pkgs/tools/networking/openssh/default.nix
View file
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@
, withGssapiPatches ? false
, kerberos
, libfido2
, withFIDO ? stdenv.hostPlatform.isUnix
, withFIDO ? stdenv.hostPlatform.isUnix && !stdenv.hostPlatform.isMusl
, linkOpenssl? true
}: