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

Commits on Dec 18, 2019

  1. qemu: 4.1.0 -> 4.2.0

    @risicle
    risicle committed Dec 18, 2019
    Copy the full SHA
    8c3a97f View commit details

Commits on Dec 19, 2019

  1. qemu: add patch for CVE-2019-15890

    @risicle
    risicle committed Dec 19, 2019
    Copy the full SHA
    f5c0d15 View commit details

Commits on Jan 2, 2020

  1. Merge pull request #76065 from risicle/ris-qemu-4.2.0 

    qemu: 4.1.0 -> 4.2.0, including patch for minor CVE-2019-15890
    @fpletz
    fpletz authored Jan 2, 2020
    Copy the full SHA
    5338dd7 View commit details
Showing with 14 additions and 8 deletions.
  1. +9 −2 pkgs/applications/virtualization/qemu/default.nix
  2. +5 −6 pkgs/applications/virtualization/qemu/no-etc-install.patch
11 changes: 9 additions & 2 deletions pkgs/applications/virtualization/qemu/default.nix
View file
Original file line number Diff line number Diff line change
@@ -35,15 +35,15 @@ let
in

stdenv.mkDerivation rec {
version = "4.1.0";
version = "4.2.0";
pname = "qemu"
+ stdenv.lib.optionalString xenSupport "-xen"
+ stdenv.lib.optionalString hostCpuOnly "-host-cpu-only"
+ stdenv.lib.optionalString nixosTestRunner "-for-vm-tests";

src = fetchurl {
url = "https://wiki.qemu.org/download/qemu-${version}.tar.bz2";
sha256 = "1bpl6hwiw1jdxk4xmqp10qgki0dji0l2rzr10dyhyk8d85vxxw29";
sha256 = "1gczv8hn3wqci86css3mhzrppp3z8vppxw25l08j589k6bvz7x1w";
};

nativeBuildInputs = [ python python.pkgs.sphinx pkgconfig flex bison ];
@@ -77,6 +77,13 @@ stdenv.mkDerivation rec {
./no-etc-install.patch
./fix-qemu-ga.patch
./9p-ignore-noatime.patch
(fetchpatch {
name = "CVE-2019-15890.patch";
url = "https://git.qemu.org/?p=libslirp.git;a=patch;h=c59279437eda91841b9d26079c70b8a540d41204";
sha256 = "1q2rc67mfdz034mk81z9bw105x9zad7n954sy3kq068b1svrf7iy";
stripLen = 1;
extraPrefix = "slirp/";
})
] ++ optional nixosTestRunner ./force-uid0-on-9p.patch
++ optionals stdenv.hostPlatform.isMusl [
(fetchpatch {
11 changes: 5 additions & 6 deletions pkgs/applications/virtualization/qemu/no-etc-install.patch
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
diff --git a/Makefile b/Makefile
index 85862fb8..ed52c5ec 100644
--- a/Makefile
+++ b/Makefile
@@ -841,7 +841,7 @@ endif
@@ -867,7 +867,7 @@ install-includedir:
$(INSTALL_DIR) "$(DESTDIR)$(includedir)"

ICON_SIZES=16x16 24x24 32x32 48x48 64x64 128x128 256x256 512x512

-install: all $(if $(BUILD_DOCS),install-doc) install-datadir install-localstatedir \
+install: all $(if $(BUILD_DOCS),install-doc) install-datadir \
install: all $(if $(BUILD_DOCS),install-doc) \
- install-datadir install-localstatedir install-includedir \
+ install-datadir install-includedir \
$(if $(INSTALL_BLOBS),$(edk2-decompressed)) \
recurse-install
ifneq ($(TOOLS),)