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

Commits on Oct 18, 2019

  1. linux: 4.14.149 -> 4.14.150

    @NeQuissimus
    NeQuissimus committed Oct 18, 2019
    Copy the full SHA
    48975d3 View commit details

  2. linux: 4.19.79 -> 4.19.80

    @NeQuissimus
    NeQuissimus committed Oct 18, 2019
    Copy the full SHA
    10beb98 View commit details

  3. linux: 4.4.196 -> 4.4.197

    @NeQuissimus
    NeQuissimus committed Oct 18, 2019
    Copy the full SHA
    8f23797 View commit details

  4. linux: 4.9.196 -> 4.9.197

    @NeQuissimus
    NeQuissimus committed Oct 18, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    9584ce6 View commit details

Commits on Oct 21, 2019

  1. mbedtls: 2.15.1 -> 2.16.0 (#53278) 

    Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/mbedtls/versions

(cherry picked from commit 436b925)
    @r-ryantm @fpletz
    r-ryantm authored and fpletz committed Oct 21, 2019

    Partially verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    We cannot verify signatures from co-authors, and some of the co-authors attributed to this commit require their commits to be signed.
    Copy the full SHA
    866194c View commit details

  2. mbedtls: 2.16.0 -> 2.16.3 

    Fixes CVE-2019-16910. Fixes #71452.

(cherry picked from commit 360e57a)
    @fpletz
    fpletz committed Oct 21, 2019
    Copy the full SHA
    8cc0abc View commit details
4 changes: 2 additions & 2 deletions pkgs/development/libraries/mbedtls/default.nix
View file
Original file line number Diff line number Diff line change
@@ -11,13 +11,13 @@

stdenv.mkDerivation rec {
name = "mbedtls-${version}";
version = "2.15.1";
version = "2.16.3";

src = fetchFromGitHub {
owner = "ARMmbed";
repo = "mbedtls";
rev = name;
sha256 = "0w6cm2f7d43wp8cx6r5h4icq8zcix1jnvivshypir1rbk1q83gx8";
sha256 = "1mzh92yyz93099a1gb2wvwc76jv12d1k1wg9k3dimbgczxgrkirc";
};

nativeBuildInputs = [ cmake ninja perl python ];
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.149";
version = "4.14.150";

# 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 = "15pjngy3j5vnisv462ll7wsg78qv7q2cz86da0bcwh446v9ap7g6";
sha256 = "1c2pxfvv31af0mzcqnbfjk8pc0wrhg4yhspl8a3ab2w5dfwa9ib5";
};
} // (args.argsOverride or {}))
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/kernel/linux-4.19.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.19.79";
version = "4.19.80";

# 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 = "0d2bcg0krahia2ylgqaxdppyr9idq2pi6y1si6h8n9sg6rj3a57i";
sha256 = "1v776s6q5wxn8ci86dwa8s8y41b94g09fnpgvzysg2h89rvbmac0";
};
} // (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, fetchurl, perl, buildLinux, ... } @ args:

buildLinux (args // rec {
version = "4.4.196";
version = "4.4.197";
extraMeta.branch = "4.4";

src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "0vd7fra22ky4sqp6vamracp5xd4900md5vdx0n4i6dhkf03kz7hn";
sha256 = "0ypfl1q1bdbk81hk0bm8a0grqzz4z5rp7z7asa3191ji3r8q9x4w";
};
} // (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, fetchurl, perl, buildLinux, ... } @ args:

buildLinux (args // rec {
version = "4.9.196";
version = "4.9.197";
extraMeta.branch = "4.9";

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