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: 329ca7db6cfd
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: f8665f18fb06
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Apr 18, 2018

  1. linux: 4.16-rc7 -> 4.17-rc1

    @NeQuissimus
    NeQuissimus committed Apr 18, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    jaraco Jason R. Coombs
    GPG key ID: 708E6CB181B4C47E
    Verified
    Learn about vigilant mode
    Copy the full SHA
    f8665f1 View commit details
Showing with 10 additions and 6 deletions.
  1. +6 −2 pkgs/os-specific/linux/kernel/common-config.nix
  2. +4 −4 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
@@ -115,7 +115,6 @@ with stdenv.lib;
# Enable various subsystems.
ACCESSIBILITY y # Accessibility support
AUXDISPLAY y # Auxiliary Display support
DONGLE y # Serial dongle support
HIPPI y
MTD_COMPLEX_MAPPINGS y # needed for many devices
SCSI_LOWLEVEL y # enable lots of SCSI devices
@@ -124,6 +123,9 @@ with stdenv.lib;
SPI y # needed for many devices
SPI_MASTER y
WAN y
${optionalString (versionOlder version "4.17") ''
DONGLE y # Serial dongle support
''}
# Networking options.
NET y
@@ -420,7 +422,9 @@ with stdenv.lib;
${optionalString (versionAtLeast version "4.3") ''
IDLE_PAGE_TRACKING y
''}
IRDA_ULTRA y # Ultra (connectionless) protocol
${optionalString (versionOlder version "4.17") ''
IRDA_ULTRA y # Ultra (connectionless) protocol
''}
JOYSTICK_IFORCE_232? y # I-Force Serial joysticks and wheels
JOYSTICK_IFORCE_USB? y # I-Force USB joysticks and wheels
JOYSTICK_XPAD_FF? y # X-Box gamepad rumble support
8 changes: 4 additions & 4 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, buildPackages, hostPlatform, fetchurl, perl, buildLinux, libelf, utillinux, ... } @ args:

buildLinux (args // rec {
version = "4.16-rc7";
modDirVersion = "4.16.0-rc7";
extraMeta.branch = "4.16";
version = "4.17-rc1";
modDirVersion = "4.17.0-rc1";
extraMeta.branch = "4.17";

src = fetchurl {
url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz";
sha256 = "13zpfjxd38202afjl6flc9brjw3sp4sfq3wls0v90k1i2b308qfi";
sha256 = "0a3lrax6f8f98lj65aawpqkzkmxcl2x4h20kr0cr7wf0jvpnn5y3";
};

# Should the testing kernels ever be built on Hydra?