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: 9c580ce77f7c
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 247bc902c52b
Choose a head ref
  • 11 commits
  • 12 files changed
  • 5 contributors

Commits on Dec 30, 2017

  1. wireguard: 0.0.20171101 -> 0.0.20171111 

    (cherry picked from commit 265f4c5)
    @fpletz
    fpletz committed Dec 30, 2017
    Copy the full SHA
    b23ac40 View commit details
    Browse the repository at this point in the history

  2. wireguard: 0.0.20171111 -> 0.0.20171221 

    (cherry picked from commit 4ce44d6)
    @fpletz
    fpletz committed Dec 30, 2017
    Copy the full SHA
    33778ff View commit details
    Browse the repository at this point in the history

  3. 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]

(cherry picked from commit 1e77d0b)
    @dguibert @fpletz
    dguibert authored and fpletz committed Dec 30, 2017
    Copy the full SHA
    1822bcb View commit details
    Browse the repository at this point in the history

  4. linuxPackages.rtlwifi_new: fix missing libelf 

    /cc #33166.  Fixes #33102.

(cherry picked from commit 5997b4f)
    @vcunat @fpletz
    vcunat authored and fpletz committed Dec 30, 2017
    Copy the full SHA
    22a9e3a View commit details
    Browse the repository at this point in the history

  5. nvidia-x11: add libelf to buildInputs 

    Signed-off-by: Christoph Hrdinka <c.github@hrdinka.at>
(cherry picked from commit d1bfa7e)
    @hrdinka @fpletz
    hrdinka authored and fpletz committed Dec 30, 2017
    Copy the full SHA
    e07d6b9 View commit details
    Browse the repository at this point in the history

  6. bbswitch: add libelf to buildInputs 

    Signed-off-by: Christoph Hrdinka <c.github@hrdinka.at>
(cherry picked from commit a3c45b3)
    @hrdinka @fpletz
    hrdinka authored and fpletz committed Dec 30, 2017
    Copy the full SHA
    42192cb View commit details
    Browse the repository at this point in the history

  7. Fix some instances of #33166 correctly 

    (cherry picked from commit 1fb0d3d)
    @fpletz
    fpletz committed Dec 30, 2017
    Copy the full SHA
    708b151 View commit details
    Browse the repository at this point in the history

  8. linuxPackages.spl: simplify expression 

    This package only contains a kernel module.

(cherry picked from commit 84d8ef6)
    @fpletz
    fpletz committed Dec 30, 2017
    Copy the full SHA
    b403f09 View commit details
    Browse the repository at this point in the history

  9. linuxPackages.zfs: use correct kernel module build flag 

    In this expression the boolean flags `buildUser` and `buildKernel` determine
if either userspace tools or the kernel module is being built.

cc #33166

(cherry picked from commit 6b74d2c)
    @fpletz
    fpletz committed Dec 30, 2017
    Copy the full SHA
    b9f6e02 View commit details
    Browse the repository at this point in the history

  10. linuxPackages.spl: eval, 84d8ef6 

    (cherry picked from commit f497999)
    @lukateras @fpletz
    lukateras authored and fpletz committed Dec 30, 2017
    Copy the full SHA
    5f92542 View commit details
    Browse the repository at this point in the history

  11. linuxPackages.spl: eval, 84d8ef6 

    Second attempt.

(cherry picked from commit 0d32189)
    @lukateras @fpletz
    lukateras authored and fpletz committed Dec 30, 2017
    Copy the full SHA
    247bc90 View commit details
    Browse the repository at this point in the history