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

Commits on Jun 24, 2017

  1. kernel: enable audio jack reconfiguration 

    Change kernel config to allow for changing the functions of the audio
jacks at run-time as well as at boot time.

(cherry picked from commit d74f835)
    @timor @NeQuissimus
    timor authored and NeQuissimus committed Jun 24, 2017
    Copy the full SHA
    89aadc3 View commit details

  2. linux_4_11: renable CONFIG_UPROBE_EVENTS 

    CONFIG_UPROBE_EVENT was renamed to CONFIG_UPROBE_EVENTS.

(cherry picked from commit e89e96a)
    @Mic92 @NeQuissimus
    Mic92 authored and NeQuissimus committed Jun 24, 2017
    Copy the full SHA
    233c29a View commit details

  3. kernel: Don't build self-test modules 

    (cherry picked from commit 370ace4)
    @dezgeg @NeQuissimus
    dezgeg authored and NeQuissimus committed Jun 24, 2017

    Verified

    This commit was signed with the committer’s verified signature.
    Josh-Cena Joshua Chen
    GPG key ID: C37145B818BDB68F
    Verified
    Learn about vigilant mode
    Copy the full SHA
    274bc99 View commit details

  4. linux: 4.11.6 -> 4.11.7 

    (cherry picked from commit 3a68f0b)
    @NeQuissimus
    NeQuissimus committed Jun 24, 2017

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    48b9d22 View commit details

  5. linux: 4.9.33 -> 4.9.34 

    (cherry picked from commit b06cb59)
    @NeQuissimus
    NeQuissimus committed Jun 24, 2017
    3
    Copy the full SHA
    e74d2b4 View commit details
Showing with 52 additions and 6 deletions.
  1. +48 −2 pkgs/os-specific/linux/kernel/common-config.nix
  2. +2 −2 pkgs/os-specific/linux/kernel/linux-4.11.nix
  3. +2 −2 pkgs/os-specific/linux/kernel/linux-4.9.nix
50 changes: 48 additions & 2 deletions pkgs/os-specific/linux/kernel/common-config.nix
View file
Original file line number Diff line number Diff line change
@@ -36,7 +36,6 @@ with stdenv.lib;
DEBUG_DEVRES n
DEBUG_STACK_USAGE n
DEBUG_STACKOVERFLOW n
RCU_TORTURE_TEST n
SCHEDSTATS n
DETECT_HUNG_TASK y
@@ -203,6 +202,8 @@ with stdenv.lib;
SND_DYNAMIC_MINORS y
SND_AC97_POWER_SAVE y # AC97 Power-Saving Mode
SND_HDA_INPUT_BEEP y # Support digital beep via input layer
SND_HDA_RECONFIG y # Support reconfiguration of jack functions
SND_HDA_PATCH_LOADER y # Support configuring jack functions via fw mechanism at boot
SND_USB_CAIAQ_INPUT y
PSS_MIXER y # Enable PSS mixer (Beethoven ADSP-16 and other compatible)
@@ -459,8 +460,10 @@ with stdenv.lib;
SCHED_TRACER y
STACK_TRACER y
${optionalString (versionOlder version "4.11") ''
${if versionOlder version "4.11" then ''
UPROBE_EVENT? y
'' else ''
UPROBE_EVENTS? y
''}
${optionalString (versionAtLeast version "4.4") ''
@@ -575,6 +578,49 @@ with stdenv.lib;
# Disable the firmware helper fallback, udev doesn't implement it any more
FW_LOADER_USER_HELPER_FALLBACK? n
# Disable various self-test modules that have no use in a production system
${optionalString (versionOlder version "4.9") ''
ARM_KPROBES_TEST? n
''}
ASYNC_RAID6_TEST? n
ATOMIC64_SELFTEST? n
BACKTRACE_SELF_TEST? n
CRC32_SELFTEST? n
CRYPTO_TEST? n
DRM_DEBUG_MM_SELFTEST? n
EFI_TEST? n
GLOB_SELFTEST? n
INTERVAL_TREE_TEST? n
LNET_SELFTEST? n
LOCK_TORTURE_TEST? n
MTD_TESTS? n
NOTIFIER_ERROR_INJECTION? n
PERCPU_TEST? n
RBTREE_TEST? n
RCU_PERF_TEST? n
RCU_TORTURE_TEST? n
TEST_ASYNC_DRIVER_PROBE? n
TEST_BITMAP? n
TEST_BPF? n
TEST_FIRMWARE? n
TEST_HASH? n
TEST_HEXDUMP? n
TEST_KSTRTOX? n
TEST_LIST_SORT? n
TEST_LKM? n
TEST_PARMAN? n
TEST_PRINTF? n
TEST_RHASHTABLE? n
TEST_SORT? n
TEST_STATIC_KEYS? n
TEST_STRING_HELPERS? n
TEST_UDELAY? n
TEST_USER_COPY? n
TEST_UUID? n
WW_MUTEX_SELFTEST? n
XZ_DEC_TEST? n
# ChromiumOS support
${optionalString (features.chromiumos or false) ''
CHROME_PLATFORMS y
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/kernel/linux-4.11.nix
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, perl, buildLinux, ... } @ args:

import ./generic.nix (args // rec {
version = "4.11.6";
version = "4.11.7";
extraMeta.branch = "4.11";

src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "0ccna0hrqcza3jz83gaxlcg5vijl83w5w3g87v93a5x06ky9nlr5";
sha256 = "1v94lkc4lzb2k9c3y7j6h4zx827abcy7jqm9jlp5n15dlbmj6bsk";
};

kernelPatches = args.kernelPatches;
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/kernel/linux-4.9.nix
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, perl, buildLinux, ... } @ args:

import ./generic.nix (args // rec {
version = "4.9.33";
version = "4.9.34";
extraMeta.branch = "4.9";

src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "0d2cai3bq1bkmisbsl6l27di765xmzn3lscwray30ldbssijpjpm";
sha256 = "0ij55aqdhqf92a79n9xqw0p32bsksw4zxpn2zhcylhgsn78mkl8k";
};

kernelPatches = args.kernelPatches;