Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: cdc2ab971b4b
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 324aafeb38b9
Choose a head ref
  • 6 commits
  • 5 files changed
  • 3 contributors

Commits on Jul 11, 2018

  1. qutebrowser: fix CVE-2018-10895

    Robert Schütz committed Jul 11, 2018
    Copy the full SHA
    af1313e View commit details

  2. Merge pull request #43368 from dotlambda/qutebrowser-cve-2018-10895 

    [18.03] qutebrowser: fix CVE-2018-10895
    @xeji
    xeji authored Jul 11, 2018
    Copy the full SHA
    e38e163 View commit details

  3. linux: 4.4.139 -> 4.4.140 

    (cherry picked from commit f8daa11)
    @NeQuissimus
    NeQuissimus committed Jul 11, 2018
    Copy the full SHA
    783be35 View commit details

  4. linux: 4.9.111 -> 4.9.112 

    (cherry picked from commit 62b1759)
    @NeQuissimus
    NeQuissimus committed Jul 11, 2018
    Copy the full SHA
    e746289 View commit details

  5. linux: 4.14.54 -> 4.14.55 

    (cherry picked from commit ed9578b)
    @NeQuissimus
    NeQuissimus committed Jul 11, 2018
    Copy the full SHA
    f8694c3 View commit details

  6. linux: 4.17.5 -> 4.17.6 

    (cherry picked from commit b34a147)
    @NeQuissimus
    NeQuissimus committed Jul 11, 2018
    Copy the full SHA
    324aafe View commit details
9 changes: 8 additions & 1 deletion pkgs/applications/networking/browsers/qutebrowser/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, lib, fetchurl, fetchzip, python3Packages
{ stdenv, lib, fetchurl, fetchzip, fetchpatch, python3Packages
, makeWrapper, wrapGAppsHook, qtbase, glib-networking
, asciidoc, docbook_xml_dtd_45, docbook_xsl, libxml2
, libxslt, gst_all_1 ? null
@@ -38,6 +38,13 @@ in python3Packages.buildPythonApplication rec {
sha256 = "01lrbkddm4wagx4hq6cz5qwvb8q8nlz0xa35k317gvr3pmnvgjk8";
};

patches = fetchpatch {
name = "CVE-2018-10895.patch";
url = https://github.com/qutebrowser/qutebrowser/commit/c2ff32d92ba9bf40ff53498ee04a4124d4993c85.patch;
excludes = [ "tests/*" ];
sha256 = "0mdqa9w1p6cmli6976v4wi0sw9r4p5prkj7lzfd1877wk11c9c73";
};

# Needs tox
doCheck = false;

4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/kernel/linux-4.14.nix
View file
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
with stdenv.lib;

buildLinux (args // rec {
version = "4.14.54";
version = "4.14.55";

# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {

src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "1imnqkhybb804ibgbpbhz16x9mk1q2qq7yzif88ajff552n445j5";
sha256 = "1mq23s990bi8nmz9rgkiln6zfxzbhcjg0hh512flp36scgi32r47";
};
} // (args.argsOverride or {}))
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/kernel/linux-4.17.nix
View file
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
with stdenv.lib;

buildLinux (args // rec {
version = "4.17.5";
version = "4.17.6";

# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {

src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "1brfnabv5lprghfyxpdr0b5z2sqdygh50j61swrk6wzzbmk0ci9z";
sha256 = "15b3k79cjlgrc4q39p1laxz2p102d6a7bpfq0mh9724qs64xd795";
};
} // (args.argsOverride or {}))
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,11 +1,11 @@
{ stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:

buildLinux (args // rec {
version = "4.4.139";
version = "4.4.140";
extraMeta.branch = "4.4";

src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "0igdsv9ihblmxfsgj646xac5n2bdawmwsr9hwyz6yjld43a5aq5n";
sha256 = "1fy7hq438sqxcdgac5dw71qbb9g38z7bdqjyl79a1b0cvqy8yk0q";
};
} // (args.argsOverride or {}))
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,11 +1,11 @@
{ stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:

buildLinux (args // rec {
version = "4.9.111";
version = "4.9.112";
extraMeta.branch = "4.9";

src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "1par6wjpr05k00nj0laxnjr02z75szpzvwv66wb0yn6wb64marjr";
sha256 = "1pphyrqi20w8k9rg5mjkl0g3f2152c4gqzhgdi4hz8mad972kv30";
};
} // (args.argsOverride or {}))