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

Commits on Jun 24, 2017

  1. linux: 4.11.6 -> 4.11.7

    @NeQuissimus
    NeQuissimus committed Jun 24, 2017
    Copy the full SHA
    3a68f0b View commit details

  2. linux: 4.9.33 -> 4.9.34

    @NeQuissimus
    NeQuissimus committed Jun 24, 2017
    Copy the full SHA
    b06cb59 View commit details
Showing with 8 additions and 5 deletions.
  1. +4 −1 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
5 changes: 4 additions & 1 deletion pkgs/os-specific/linux/kernel/common-config.nix
View file
Original file line number Diff line number Diff line change
@@ -593,7 +593,10 @@ with stdenv.lib;
FW_LOADER_USER_HELPER_FALLBACK? n
# Disable various self-test modules that have no use in a production system
ARM_KPROBES_TEST? n
${optionalString (versionOlder version "4.9") ''
ARM_KPROBES_TEST? n
''}
ASYNC_RAID6_TEST? n
ATOMIC64_SELFTEST? n
BACKTRACE_SELF_TEST? n
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;