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: 15409cd772a1
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 8b5194ff167e
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Oct 29, 2019

  1. [R19.09] qemu: 4.0.0 -> 4.0.1

    @kmcopper
    kmcopper committed Oct 29, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    ljharb Jordan Harband
    GPG key ID: 9F6A681E35EF8B56
    Verified
    Learn about vigilant mode
    Copy the full SHA
    6707534 View commit details

Commits on Nov 7, 2019

  1. Merge pull request #72236 from kmcopper/r19.09-qemu_4.0.1 

    [r19.09] qemu: 4.0.0 -> 4.0.1
    @matthewbauer
    matthewbauer authored Nov 7, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    ljharb Jordan Harband
    GPG key ID: 9F6A681E35EF8B56
    Verified
    Learn about vigilant mode
    Copy the full SHA
    8b5194f View commit details
Showing with 2 additions and 8 deletions.
  1. +2 −8 pkgs/applications/virtualization/qemu/default.nix
10 changes: 2 additions & 8 deletions pkgs/applications/virtualization/qemu/default.nix
View file
Original file line number Diff line number Diff line change
@@ -35,7 +35,7 @@ let
in

stdenv.mkDerivation rec {
version = "4.0.0";
version = "4.0.1";
name = "qemu-"
+ stdenv.lib.optionalString xenSupport "xen-"
+ stdenv.lib.optionalString hostCpuOnly "host-cpu-only-"
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {

src = fetchurl {
url = "https://wiki.qemu.org/download/qemu-${version}.tar.bz2";
sha256 = "085g6f75si8hbn94mnnjn1r7ysixn5bqj4bhqwvadj00fhzp2zvd";
sha256 = "11mv5sh9qb5mp6rcr527hbg1r2mi64qjbrr2w65wgdwrb6a1rg8h";
};

nativeBuildInputs = [ python python.pkgs.sphinx pkgconfig flex bison ];
@@ -83,12 +83,6 @@ 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";