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

Commits on Mar 19, 2017

  1. grsecurity: 4.9.15-201703150049 -> 4.9.16-201703180820

    (cherry picked from commit d440981)
    joachifm committed Mar 19, 2017
    Copy the full SHA
    07c2541 View commit details
  2. linux_4_9: 4.9.15 -> 4.9.16

    (cherry picked from commit b5da6ca)
    joachifm committed Mar 19, 2017

    Verified

    This commit was signed with the committer’s verified signature.
    Mic92 Jörg Thalheim
    Copy the full SHA
    35e6ef8 View commit details
Showing with 7 additions and 7 deletions.
  1. +2 −2 pkgs/os-specific/linux/kernel/linux-4.9.nix
  2. +2 −2 pkgs/os-specific/linux/kernel/linux-grsecurity.nix
  3. +3 −3 pkgs/os-specific/linux/kernel/patches.nix
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/kernel/linux-4.9.nix
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.15";
version = "4.9.16";
extraMeta.branch = "4.9";

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

kernelPatches = args.kernelPatches;
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/kernel/linux-grsecurity.nix
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.15";
version = "4.9.16";
extraMeta.branch = "4.9";

src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha512 = "3p0cfjfmq4r04w6bjyi2aphq171yavv9m06b29wjsglb1bbkyiy4v278r99cq913msmdp3xs0ba1rkc36qp7cv7hxc29pj0w06ajwls";
sha512 = "3fhzfdiziad5blzcqfbrxjphcygmhd7jzrricpkn7mvg069csrq0yvlbsxksqii0ahk77wzs1nmkfx138y21v4745dk6rf0438jv7md";
};

kernelPatches = args.kernelPatches;
6 changes: 3 additions & 3 deletions pkgs/os-specific/linux/kernel/patches.nix
Original file line number Diff line number Diff line change
@@ -95,9 +95,9 @@ rec {
};

grsecurity_testing = grsecPatch
{ kver = "4.9.15";
grrev = "201703150049";
sha512 = "1x02ncl94835n85kpp5bfvy6863sb482fw30x2pqszi4aivjc31i77vj135a7f508ni1b9rbbl8a0m3q4nb8gdbia75zcxbjdi9ij9m";
{ kver = "4.9.16";
grrev = "201703180820";
sha512 = "114yqjffxnf412ypaq91r732mi4im2qakj07g0nbqx1qyg319qag5ckc5438kcny3qhzb9wyrwr6mhza51cq7js40ps2aw7alwjfgql";
};

# This patch relaxes grsec constraints on the location of usermode helpers,