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
base: 78e9665b48ff
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: d64de62fcda6
Choose a head ref
  • 2 commits
  • 10 files changed
  • 2 contributors

Commits on Apr 6, 2018

  1. linux: Add 4.14

    @NeQuissimus @domenkozar
    NeQuissimus authored and domenkozar committed Apr 6, 2018
    Copy the full SHA
    9f9f727 View commit details
    Browse the repository at this point in the history

Commits on Apr 7, 2018

  1. kernel 4.14 require libelf to compile modules. 

    [...]
make modules -C /nix/store/h1vzl6bq4wif3m8dd1bw2p3fv4shjg3n-linux-4.14.9-dev/lib/modules/4.14.9/build EXTRA_CFLAGS=-Werror-implicit-function-declaration M=/tmp/nix-build-spl-kernel-2017-11-16-4.14.9.drv-0/source/build
/nix/store/h1vzl6bq4wif3m8dd1bw2p3fv4shjg3n-linux-4.14.9-dev/lib/modules/4.14.9/source/Makefile:939: *** "Cannot generate ORC metadata for CONFIG_UNWINDER_ORC=y, please install libelf-dev, libelf-devel or elfutils-libelf-devel". Stop.

This patch introduces kernel.moduleBuildDependencies to avoid the logic "stdenv.lib.optional (stdenv.lib.versionAtLeast kernel.version "4.14") libelf" in multiple places.

[dezgeg did some minor tweaks on top]
    @dguibert @domenkozar
    dguibert authored and domenkozar committed Apr 7, 2018
    Copy the full SHA
    d64de62 View commit details
    Browse the repository at this point in the history