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

Commits on Sep 28, 2019

  1. qemu: add patches for CVE-2019-13164 & CVE-2019-14378

    @risicle
    risicle committed Sep 28, 2019
    Copy the full SHA
    38a4dc2 View commit details

Commits on Oct 27, 2019

  1. Merge pull request #69925 from risicle/ris-qemu-CVEs-r19.09 

    [19.09] qemu: add patches for CVE-2019-13164 & CVE-2019-14378
    Christian Kauhaus authored Oct 27, 2019
    Copy the full SHA
    1475cc7 View commit details

  2. riot-web: 1.4.2 -> 1.5.0 

    (cherry picked from commit 050db8d)
    @pacien @worldofpeace
    pacien authored and worldofpeace committed Oct 27, 2019
    Copy the full SHA
    5635623 View commit details

  3. riot-desktop: 1.4.2 -> 1.5.0 

    (cherry picked from commit cacd744)
    @pacien @worldofpeace
    pacien authored and worldofpeace committed Oct 27, 2019
    Copy the full SHA
    6908c4a View commit details
2 changes: 1 addition & 1 deletion pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json
View file
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
"name": "riot-web",
"productName": "Riot",
"main": "src/electron-main.js",
"version": "1.4.2",
"version": "1.5.0",
"description": "A feature-rich client for Matrix.org",
"author": "New Vector Ltd.",
"dependencies": {
4 changes: 2 additions & 2 deletions pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix
View file
Original file line number Diff line number Diff line change
@@ -6,12 +6,12 @@

let
executableName = "riot-desktop";
version = "1.4.2";
version = "1.5.0";
riot-web-src = fetchFromGitHub {
owner = "vector-im";
repo = "riot-web";
rev = "v${version}";
sha256 = "1s1m2jbcax92pql9yzw3kxdmn97a2xnas49rw3n1vldkla2wx4zx";
sha256 = "1xi5zg3602d7gdjxskpk2q3anpn2drrkxyirfvi9mzcfp2r05557";
};

in yarn2nix-moretea.mkYarnPackage rec {
4 changes: 2 additions & 2 deletions pkgs/applications/networking/instant-messengers/riot/riot-web.nix
View file
Original file line number Diff line number Diff line change
@@ -5,11 +5,11 @@

stdenv.mkDerivation rec {
pname = "riot-web";
version = "1.4.2";
version = "1.5.0";

src = fetchurl {
url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz";
sha256 = "0bbal3y4clgp7j703f3ll5zwhbpjz6zpw3qslwza6lik4g4k0vaj";
sha256 = "08r9473ncfy3wzqhnds729s77fq82jjgz8w3yya07aahcxzasi94";
};

installPhase = let
10 changes: 10 additions & 0 deletions pkgs/applications/virtualization/qemu/default.nix
View file
Original file line number Diff line number Diff line change
@@ -83,6 +83,16 @@ stdenv.mkDerivation rec {
name = "CVE-2019-12155.patch";
sha256 = "0h2q71mcz3gvlrbfkqcgla74jdg73hvzcrwr4max2ckpxx8x9207";
})
(fetchpatch {
url = "https://sources.debian.org/data/main/q/qemu/1:3.1+dfsg-8+deb10u2/debian/patches/slirp-fix-heap-overflow-in-ip_reass-on-big-packet-input-CVE-2019-14378.patch";
sha256 = "0f3jabl6x6slpnz5pg6fv1k9vfmrkd482z9vqm3adn6mka8lfimb";
extraPrefix = "slirp/src/";
stripLen = 2;
})
(fetchpatch {
url = "https://sources.debian.org/data/main/q/qemu/1:3.1+dfsg-8+deb10u2/debian/patches/qemu-bridge-helper-restrict-interface-name-to-IFNAMSIZ-CVE-2019-13164.patch";
sha256 = "1ypcdlpg3nap0kg9xkrgrqw33j5ah4j7l4i2cp6d5ap8vrw9nn3l";
})
] ++ optional nixosTestRunner ./force-uid0-on-9p.patch
++ optionals stdenv.hostPlatform.isMusl [
(fetchpatch {