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

Commits on Jun 29, 2017

  1. linux: 4.4.74 -> 4.4.75

    @NeQuissimus
    NeQuissimus committed Jun 29, 2017

    Verified

    This commit was signed with the committer’s verified signature.
    edwtjo Edward Tjörnhammar
    GPG key ID: 7B82CE4A866B6845
    Verified
    Learn about vigilant mode
    Copy the full SHA
    6b35f22 View commit details

  2. linux: 4.9.34 -> 4.9.35 

    Also, remove XSA-216 patches, the fixes are now integrated upstream
    @NeQuissimus
    NeQuissimus committed Jun 29, 2017

    Verified

    This commit was signed with the committer’s verified signature.
    edwtjo Edward Tjörnhammar
    GPG key ID: 7B82CE4A866B6845
    Verified
    Learn about vigilant mode
    Copy the full SHA
    d1aff8d View commit details

  3. linux: 4.11.7 -> 4.11.8

    @NeQuissimus
    NeQuissimus committed Jun 29, 2017

    Verified

    This commit was signed with the committer’s verified signature.
    edwtjo Edward Tjörnhammar
    GPG key ID: 7B82CE4A866B6845
    Verified
    Learn about vigilant mode
    Copy the full SHA
    37bc494 View commit details
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.7";
version = "4.11.8";
extraMeta.branch = "4.11";

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

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.74";
version = "4.4.75";
extraMeta.branch = "4.4";

src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "13l0axybmr0lz1br9kxyc6s3mzgais32f54xii7vs4nia1hss6f3";
sha256 = "0l3rklx1957czsddg3jb5xw5rvw8bf58s4yrkswikphv7j5crzjg";
};

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.34";
version = "4.9.35";
extraMeta.branch = "4.9";

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

kernelPatches = args.kernelPatches;
17 changes: 0 additions & 17 deletions pkgs/os-specific/linux/kernel/patches.nix
View file
Original file line number Diff line number Diff line change
@@ -156,21 +156,4 @@ rec {
sha256 = "10dmv3d3gj8rvj9h40js4jh8xbr5wyaqiy0kd819mya441mj8ll2";
};
};

# https://xenbits.xen.org/xsa/advisory-216.html
xen_XSA_216 =
{ name = "xen_XSA-216";
patch = fetchpatch {
url = "https://xenbits.xen.org/xsa/xsa216-linux-4.11.patch";
sha256 = "14h017n6qwnraw5bv72q9xkg2w7xvx290505kny5zfwx891xahs8";
};
};

xen_XSA_216_4-4 =
{ name = "xen_XSA-216-4.4";
patch = fetchpatch {
url = "https://xenbits.xen.org/xsa/xsa216-linux-4.4.patch";
sha256 = "1lv50wpr4lr49i4vp04vl778wcs9xn1jm51hp91h87jr0g3pbvi2";
};
};
}
6 changes: 1 addition & 5 deletions pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -11930,7 +11930,6 @@ with pkgs;
[ kernelPatches.bridge_stp_helper
kernelPatches.p9_fixes
kernelPatches.cpu-cgroup-v2."4.4"
kernelPatches.xen_XSA_216_4-4
]
++ lib.optionals ((platform.kernelArch or null) == "mips")
[ kernelPatches.mips_fpureg_emu
@@ -11945,7 +11944,6 @@ with pkgs;
kernelPatches.p9_fixes
kernelPatches.cpu-cgroup-v2."4.9"
kernelPatches.modinst_arg_list_too_long
kernelPatches.xen_XSA_216
]
++ lib.optionals ((platform.kernelArch or null) == "mips")
[ kernelPatches.mips_fpureg_emu
@@ -11962,7 +11960,6 @@ with pkgs;
# when adding a new linux version
kernelPatches.cpu-cgroup-v2."4.11"
kernelPatches.modinst_arg_list_too_long
kernelPatches.xen_XSA_216
]
++ lib.optionals ((platform.kernelArch or null) == "mips")
[ kernelPatches.mips_fpureg_emu
@@ -11976,7 +11973,6 @@ with pkgs;
kernelPatches.bridge_stp_helper
kernelPatches.p9_fixes
kernelPatches.modinst_arg_list_too_long
kernelPatches.xen_XSA_216
] ++ lib.optionals ((platform.kernelArch or null) == "mips") [
kernelPatches.mips_fpureg_emu
kernelPatches.mips_fpu_sigill
@@ -13610,7 +13606,7 @@ with pkgs;
doodle = callPackage ../applications/search/doodle { };

draftsight = callPackage ../applications/graphics/draftsight { };

droopy = callPackage ../applications/networking/droopy {
inherit (python3Packages) wrapPython;
};