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: 9287dbd159a2
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 814b077cafa9
Choose a head ref
  • 4 commits
  • 4 files changed
  • 3 contributors

Commits on Jan 6, 2018

  1. linuxPackages.ena: 1.2.0 -> 1.5.0; fix build dependencies 

    (cherry picked from commit 91f03e6)
    @Mic92 @dezgeg
    Mic92 authored and dezgeg committed Jan 6, 2018
    Copy the full SHA
    8345069 View commit details

  2. linuxPackages.ixgbevf: needs libelf from kernel.moduleBuildDependencies 

    (cherry picked from commit c513945)
    @Mic92 @dezgeg
    Mic92 authored and dezgeg committed Jan 6, 2018
    Copy the full SHA
    1f0d023 View commit details

  3. broadcom-sta: fix build 

    (cherry picked from commit 4e990c2)
    @lukateras @dezgeg
    lukateras authored and dezgeg committed Jan 6, 2018

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    14e7b2a View commit details

  4. 2018 will be the year of NixOS 

    (cherry picked from commit cb178e7)
    @grahamc @dezgeg
    grahamc authored and dezgeg committed Jan 6, 2018
    Copy the full SHA
    814b077 View commit details
Showing with 26 additions and 22 deletions.
  1. +1 −1 COPYING
  2. +2 −0 pkgs/os-specific/linux/broadcom-sta/default.nix
  3. +21 −21 pkgs/os-specific/linux/ena/default.nix
  4. +2 −0 pkgs/os-specific/linux/ixgbevf/default.nix
2 changes: 1 addition & 1 deletion COPYING
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright (c) 2003-2017 Eelco Dolstra and the Nixpkgs/NixOS contributors
Copyright (c) 2003-2018 Eelco Dolstra and the Nixpkgs/NixOS contributors

Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
2 changes: 2 additions & 0 deletions pkgs/os-specific/linux/broadcom-sta/default.nix
View file
Original file line number Diff line number Diff line change
@@ -21,6 +21,8 @@ stdenv.mkDerivation {

hardeningDisable = [ "pic" ];

nativeBuildInputs = kernel.moduleBuildDependencies;

patches = [
./i686-build-failure.patch
./license.patch
42 changes: 21 additions & 21 deletions pkgs/os-specific/linux/ena/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,41 +1,41 @@
{ lib, stdenv, fetchFromGitHub, kernel, kmod }:

stdenv.mkDerivation rec {
version = "1.2.0";
version = "1.5.0";
name = "ena-${version}-${kernel.version}";

src = fetchFromGitHub {
owner = "amzn";
repo = "amzn-drivers";
rev = "ena_linux_${version}";
sha256 = "0m0jqd6gyk4r43w6p5dvp1djg2qgvyhnzmg53sszlh55mlgla714";
sha256 = "1h3vnwa2129advyws69n0sqyra4nz68mng6g84whbvhzjyx810sj";
};

hardeningDisable = [ "pic" ];

nativeBuildInputs = kernel.moduleBuildDependencies;

# linux 3.12
NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration";

configurePhase =
''
cd kernel/linux/ena
substituteInPlace Makefile --replace '/lib/modules/$(BUILD_KERNEL)' ${kernel.dev}/lib/modules/${kernel.modDirVersion}
'';

installPhase =
''
strip -S ena.ko
dest=$out/lib/modules/${kernel.modDirVersion}/misc
mkdir -p $dest
cp ena.ko $dest/
xz $dest/ena.ko
'';

meta = {
configurePhase = ''
cd kernel/linux/ena
substituteInPlace Makefile --replace '/lib/modules/$(BUILD_KERNEL)' ${kernel.dev}/lib/modules/${kernel.modDirVersion}
'';

installPhase = ''
strip -S ena.ko
dest=$out/lib/modules/${kernel.modDirVersion}/misc
mkdir -p $dest
cp ena.ko $dest/
xz $dest/ena.ko
'';

meta = with stdenv.lib; {
description = "Amazon Elastic Network Adapter (ENA) driver for Linux";
homepage = https://github.com/amzn/amzn-drivers;
license = lib.licenses.gpl2;
maintainers = [ lib.maintainers.eelco ];
platforms = lib.platforms.linux;
license = licenses.gpl2;
maintainers = [ maintainers.eelco ];
platforms = platforms.linux;
};
}
2 changes: 2 additions & 0 deletions pkgs/os-specific/linux/ixgbevf/default.nix
View file
Original file line number Diff line number Diff line change
@@ -9,6 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "1666hsavaspjmf45ij396mkndzk6g0n3ibr2glfdhjfqhfy35zb8";
};

nativeBuildInputs = kernel.moduleBuildDependencies;

hardeningDisable = [ "pic" ];

configurePhase = ''