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: cd33f3aaeb1b
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: df77ecc99d0e
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Apr 5, 2020

  1. ssh validationPackage is a single value, not a list

    @FRidh
    FRidh committed Apr 5, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    cole-h Cole Helbling
    GPG key ID: B37E0F2371016A4C
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    518d5be View commit details

  2. zenpower: makeFlags is a list

    @FRidh
    FRidh committed Apr 5, 2020
    Copy the full SHA
    df77ecc View commit details
Showing with 3 additions and 3 deletions.
  1. +2 −2 nixos/modules/services/networking/ssh/sshd.nix
  2. +1 −1 pkgs/os-specific/linux/zenpower/default.nix
4 changes: 2 additions & 2 deletions nixos/modules/services/networking/ssh/sshd.nix
View file
Original file line number Diff line number Diff line change
@@ -9,8 +9,8 @@ let
# This middle-ground solution ensures *an* sshd can do their basic validation
# on the configuration.
validationPackage = if pkgs.stdenv.buildPlatform == pkgs.stdenv.hostPlatform
then [ cfgc.package ]
else [ pkgs.buildPackages.openssh ];
then cfgc.package
else pkgs.buildPackages.openssh;

sshconf = pkgs.runCommand "sshd.conf-validated" { nativeBuildInputs = [ validationPackage ]; } ''
cat >$out <<EOL
2 changes: 1 addition & 1 deletion pkgs/os-specific/linux/zenpower/default.nix
View file
Original file line number Diff line number Diff line change
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {

nativeBuildInputs = kernel.moduleBuildDependencies;

makeFlags = "KERNEL_BUILD=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build";
makeFlags = [ "KERNEL_BUILD=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ];

installPhase = ''
install -D zenpower.ko -t "$out/lib/modules/${kernel.modDirVersion}/kernel/drivers/hwmon/zenpower/"