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: 0ea6ab80971b
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: e8fcced76e7f
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Nov 28, 2017

  1. Revert "linux-testing: 4.14-rc8 -> 4.15-rc1" 

    This reverts commit 9335f1d.

Doesn't compile, a working version is at #32137.
    @dezgeg
    dezgeg committed Nov 28, 2017

    Verified

    This commit was signed with the committer’s verified signature.
    archen Kevin Glavin
    SSH Key Fingerprint: FaA1EStLaN7M1RSyE3RHkLpXDBPWN/yftVyvHCBnGVQ
    Verified
    Learn about vigilant mode
    Copy the full SHA
    acbaefa View commit details

  2. linux-testing: 4.14-rc8 -> 4.15-rc1 

    Closes #32137
    @dezgeg
    Philipp Steinpass authored and dezgeg committed Nov 28, 2017

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    e8fcced View commit details
Showing with 9 additions and 2 deletions.
  1. +1 −1 pkgs/os-specific/linux/kernel/linux-testing.nix
  2. +8 −1 pkgs/os-specific/linux/kernel/manual-config.nix
2 changes: 1 addition & 1 deletion pkgs/os-specific/linux/kernel/linux-testing.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
{ stdenv, hostPlatform, fetchurl, perl, buildLinux, libelf, utillinux, ... } @ args:

import ./generic.nix (args // rec {
version = "4.15-rc1";
9 changes: 8 additions & 1 deletion pkgs/os-specific/linux/kernel/manual-config.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
{ runCommand, nettools, bc, perl, gmp, libmpc, mpfr, kmod, openssl
, libelf ? null
, utillinux ? null
, writeTextFile, ubootTools
, hostPlatform
}:
@@ -230,13 +232,18 @@ let
};
in

assert stdenv.lib.versionAtLeast version "4.15" -> libelf != null;
assert stdenv.lib.versionAtLeast version "4.15" -> utillinux != null;
stdenv.mkDerivation ((drvAttrs config stdenv.platform (kernelPatches ++ nativeKernelPatches) configfile) // {
name = "linux-${version}";

enableParallelBuilding = true;

nativeBuildInputs = [ perl bc nettools openssl gmp libmpc mpfr ]
++ optional (stdenv.platform.kernelTarget == "uImage") ubootTools;
++ optional (stdenv.platform.kernelTarget == "uImage") ubootTools
++ optional (stdenv.lib.versionAtLeast version "4.15") libelf
++ optional (stdenv.lib.versionAtLeast version "4.15") utillinux
;

hardeningDisable = [ "bindnow" "format" "fortify" "stackprotector" "pic" ];