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

Commits on Apr 5, 2020

  1. Use env. for environment variables

    @FRidh
    FRidh committed Apr 5, 2020
    5

    Verified

    This commit was signed with the committer’s verified signature.
    peterromfeldhk Peter Romfeld
    GPG key ID: D10E6F3F15306D73
    Verified
    Learn about vigilant mode
    Copy the full SHA
    e256a20 View commit details

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

    @FRidh
    FRidh committed Apr 5, 2020
    Copy the full SHA
    742ae57 View commit details

  3. zenpower: makeFlags is a list

    @FRidh
    FRidh committed Apr 5, 2020
    Copy the full SHA
    9063bff View commit details
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/ddcci/default.nix
View file
Original file line number Diff line number Diff line change
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {

nativeBuildInputs = kernel.moduleBuildDependencies;

NIX_CFLAGS_COMPILE = [ "-Wno-error=incompatible-pointer-types" ];
env.NIX_CFLAGS_COMPILE = [ "-Wno-error=incompatible-pointer-types" ];

prePatch = ''
substituteInPlace ./ddcci/Makefile \
2 changes: 1 addition & 1 deletion pkgs/os-specific/linux/usbip/default.nix
View file
Original file line number Diff line number Diff line change
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
nativeBuildInputs = [ autoconf automake libtool ];
buildInputs = [ udev ];

NIX_CFLAGS_COMPILE = [ "-Wno-error=address-of-packed-member" ];
env.NIX_CFLAGS_COMPILE = [ "-Wno-error=address-of-packed-member" ];

preConfigure = ''
cd tools/usb/usbip
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/"
2 changes: 1 addition & 1 deletion pkgs/servers/x11/xorg/overrides.nix
View file
Original file line number Diff line number Diff line change
@@ -407,7 +407,7 @@ self: super:
xf86videowsfb = super.xf86videowsfb.overrideAttrs (attrs: { meta = attrs.meta // { broken = true; }; });

xf86videoomap = super.xf86videoomap.overrideAttrs (attrs: {
NIX_CFLAGS_COMPILE = [ "-Wno-error=format-overflow" ];
env.NIX_CFLAGS_COMPILE = [ "-Wno-error=format-overflow" ];
});

xf86videoamdgpu = super.xf86videoamdgpu.overrideAttrs (attrs: {