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: 9452b4a91435
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 158525da9f50
Choose a head ref
  • 4 commits
  • 4 files changed
  • 2 contributors

Commits on Jun 9, 2018

  1. lttng-modules: add 'libelf' to fix build against linux 4.14 

    Fixes this:

$ nix-build -A linuxPackages.lttng-modules
[...]
/nix/store/...-linux-4.14.48-dev/lib/modules/4.14.48/source/Makefile:948: \
  *** "Cannot generate ORC metadata for CONFIG_UNWINDER_ORC=y, please install libelf-dev, libelf-devel or elfu

(Linux 4.16+ has other issues, so mark as broken.)

(cherry picked from commit 0f85941)
    @bjornfor
    bjornfor committed Jun 9, 2018
    Copy the full SHA
    4d6f07c View commit details
    Browse the repository at this point in the history

  2. lttng-modules: use kernel.moduleBuildDependencies 

    Instead of explicitly depending on libelf, use
kernel.moduleBuildDependencies which was introduced in 1e77d0b
("kernel 4.14 require libelf to compile modules.").

(cherry picked from commit 7dbd9a6)
    @bjornfor
    bjornfor committed Jun 9, 2018
    Copy the full SHA
    7dcd2a4 View commit details
    Browse the repository at this point in the history

  3. flashplayer: 29.0.0.171 -> 30.0.0.113 

    (cherry picked from commit 95aa3f4)
    @dywedir @bjornfor
    dywedir authored and bjornfor committed Jun 9, 2018
    Copy the full SHA
    ef2da27 View commit details
    Browse the repository at this point in the history

  4. flashplayer: fix sha256 hash 

    (cherry picked from commit 16ee92e)
    @dywedir @bjornfor
    dywedir authored and bjornfor committed Jun 9, 2018
    Copy the full SHA
    158525d View commit details
    Browse the repository at this point in the history