Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 78e9665b48ff
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2c1838ab99b0
Choose a head ref
  • 5 commits
  • 13 files changed
  • 3 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

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

    Verified

    This commit was signed with the committer’s verified signature.
    AluisioASG Aluísio Augusto Silva Gonçalves
    GPG key ID: DA6EA2FACDB1CBD2
    Verified
    Learn about vigilant mode
    Copy the full SHA
    d64de62 View commit details

  2. kernel: depend optionally on libelf

    @domenkozar
    domenkozar committed Apr 7, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    7f561ed View commit details

  3. e2fsprogs: 1.43.8 -> 1.44.1 

    (cherry picked from commit e611478)
Signed-off-by: Domen Kožar <domen@dev.si>
    @domenkozar
    domenkozar committed Apr 7, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    d51b565 View commit details

  4. btrfs-progs: 4.14.1 -> 4.15.1 

    (cherry picked from commit 11238ff)
Signed-off-by: Domen Kožar <domen@dev.si>
    @domenkozar
    domenkozar committed Apr 7, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    veprbl Dmitry Kalinkin
    GPG key ID: 5157B3EC8B2CA333
    Verified
    Learn about vigilant mode
    Copy the full SHA
    2c1838a View commit details
Loading