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

Commits on May 15, 2017

  1. linux-testing: 4.11-rc7 -> 4.12-rc1

    @NeQuissimus
    NeQuissimus committed May 15, 2017
    Copy the full SHA
    336b044 View commit details

Commits on May 17, 2017

  1. Merge pull request #25792 from NeQuissimus/linux_4_12_rc1 

    linux-testing: 4.11-rc7 -> 4.12-rc1
    @NeQuissimus
    NeQuissimus authored May 17, 2017
    Copy the full SHA
    8eb302d View commit details
Showing with 11 additions and 7 deletions.
  1. +6 −2 pkgs/os-specific/linux/kernel/common-config.nix
  2. +5 −5 pkgs/os-specific/linux/kernel/linux-testing.nix
8 changes: 6 additions & 2 deletions pkgs/os-specific/linux/kernel/common-config.nix
View file
Original file line number Diff line number Diff line change
@@ -214,7 +214,9 @@ with stdenv.lib;
SND_AC97_POWER_SAVE y # AC97 Power-Saving Mode
SND_HDA_INPUT_BEEP y # Support digital beep via input layer
SND_USB_CAIAQ_INPUT y
PSS_MIXER y # Enable PSS mixer (Beethoven ADSP-16 and other compatible)
${optionalString (versionOlder version "4.12") ''
PSS_MIXER y # Enable PSS mixer (Beethoven ADSP-16 and other compatible)
''}
# USB serial devices.
USB_SERIAL_GENERIC y # USB Generic Serial Driver
@@ -495,7 +497,9 @@ with stdenv.lib;
${optionalString (versionAtLeast version "4.0") ''
KVM_COMPAT? y
''}
KVM_DEVICE_ASSIGNMENT? y
${optionalString (versionOlder version "4.12") ''
KVM_DEVICE_ASSIGNMENT? y
''}
${optionalString (versionAtLeast version "4.0") ''
KVM_GENERIC_DIRTYLOG_READ_PROTECT y
''}
10 changes: 5 additions & 5 deletions pkgs/os-specific/linux/kernel/linux-testing.nix
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{ stdenv, fetchurl, perl, buildLinux, ... } @ args:

import ./generic.nix (args // rec {
version = "4.11-rc7";
modDirVersion = "4.11.0-rc7";
extraMeta.branch = "4.11";
version = "4.12-rc1";
modDirVersion = "4.12.0-rc1";
extraMeta.branch = "4.12";

src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/testing/linux-${version}.tar.xz";
sha256 = "0zifawlrc62gsqmg91858wxx7vbpz0drjbhzmmbpplj3j7pdlly5";
url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz";
sha256 = "13xyiqn7xv8ryqrfsx8b18qm1zj0qkfz92mdh611nqhhdlw7gcpk";
};

features.iwlwifi = true;