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

Commits on Jul 15, 2017

  1. linux: 4.12.1 -> 4.12.2

    @NeQuissimus
    NeQuissimus committed Jul 15, 2017

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    infinisil Silvan Mosberger
    GPG key ID: E8F1E9EAD284E17D
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    c5ef98b View commit details

  2. linux: 4.11.10 -> 4.11.11

    @NeQuissimus
    NeQuissimus committed Jul 15, 2017
    Copy the full SHA
    ccec165 View commit details

  3. linux: 4.9.37 -> 4.9.38 

    Remove temporary patches to perf as well
    @NeQuissimus
    NeQuissimus committed Jul 15, 2017
    1
    Copy the full SHA
    b04858d View commit details

  4. linux: 4.4.76 -> 4.4.77

    @NeQuissimus
    NeQuissimus committed Jul 15, 2017
    Copy the full SHA
    81b9933 View commit details

  5. linux-testing: 4.12-rc7 -> 4.13-rc1

    @NeQuissimus
    NeQuissimus committed Jul 15, 2017
    Copy the full SHA
    b103e93 View commit details
4 changes: 3 additions & 1 deletion pkgs/os-specific/linux/kernel/common-config.nix
View file
Original file line number Diff line number Diff line change
@@ -302,7 +302,9 @@ with stdenv.lib;
CIFS_UPCALL y
CIFS_ACL y
CIFS_DFS_UPCALL y
CIFS_SMB2 y
${optionalString (versionOlder version "4.13") ''
CIFS_SMB2 y
''}
${optionalString (versionAtLeast version "3.12") ''
CEPH_FSCACHE 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, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:

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

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

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

import ./generic.nix (args // rec {
version = "4.12.1";
version = "4.12.2";
extraMeta.branch = "4.12";

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

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

import ./generic.nix (args // rec {
version = "4.4.76";
version = "4.4.77";
extraMeta.branch = "4.4";

src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "180mngyar7ky2aiaszmgfqpfvwi0kxcym8j3ifflzggwqjkgrrki";
sha256 = "1s5l5b3hpm691w94a3ddliy4gcxi2s9xm3hsazdwgzqrqdv70ysy";
};

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, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:

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

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

kernelPatches = args.kernelPatches;
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, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:

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

src = fetchurl {
url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz";
sha256 = "1svfswv0b4gagv1yiavwb22p726h0w81lgxjqq0h9m3gf4xlqp3x";
sha256 = "1pdbykp2336vk7ynrz0l95rwqags6kklbr08wjc7zpmdaad6yd6m";
};

features.iwlwifi = true;
224 changes: 0 additions & 224 deletions pkgs/os-specific/linux/kernel/perf-offline-probe.patch
View file

This file was deleted.

2 changes: 1 addition & 1 deletion pkgs/os-specific/linux/kernel/perf.nix
View file
Original file line number Diff line number Diff line change
@@ -13,7 +13,7 @@ stdenv.mkDerivation {

inherit (kernel) src;

patches = kernel.patches ++ [ ./perf-binutils-path.patch ./perf-offline-probe.patch ];
patches = kernel.patches ++ [ ./perf-binutils-path.patch ];

preConfigure = ''
cd tools/perf