From eb915f2b3cd4ae4e6e8627e8c2b3e0a117543a06 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sat, 24 Mar 2018 20:52:55 -0500 Subject: [PATCH 1/2] spice: 0.13.3 -> 0.14.0 --- pkgs/development/libraries/spice/default.nix | 23 ++------------------ 1 file changed, 2 insertions(+), 21 deletions(-) diff --git a/pkgs/development/libraries/spice/default.nix b/pkgs/development/libraries/spice/default.nix index 1ab76340cc7c..ee54ad555537 100644 --- a/pkgs/development/libraries/spice/default.nix +++ b/pkgs/development/libraries/spice/default.nix @@ -6,32 +6,13 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "spice-0.13.3"; + name = "spice-0.14.0"; src = fetchurl { url = "http://www.spice-space.org/download/releases/${name}.tar.bz2"; - sha256 = "17mqgwamdhj8sx8vhahrjl5937x693kjnw6cp6v0akjrwz011xrh"; + sha256 = "0j5q7cp5p95jk8fp48gz76rz96lifimdsx1wnpmfal0nnnar9nrs"; }; - patches = [ - # the following three patches fix CVE-2016-9577 and CVE-2016-9578 - (fetchpatch { - name = "0001-Prevent-possible-DoS-attempts-during-protocol-handsh.patch"; - url = "http://src.fedoraproject.org/cgit/rpms/spice.git/plain/0001-Prevent-possible-DoS-attempts-during-protocol-handsh.patch?id=d919d639ae5f83a9735a04d843eed675f9357c0d"; - sha256 = "11x5566lx5zyl7f39glwsgpzkxb7hpcshx8va5ab3imrns07130q"; - }) - (fetchpatch { - name = "0002-Prevent-integer-overflows-in-capability-checks.patch"; - url = "http://src.fedoraproject.org/cgit/rpms/spice.git/plain/0002-Prevent-integer-overflows-in-capability-checks.patch?id=d919d639ae5f83a9735a04d843eed675f9357c0d"; - sha256 = "1r1bhq98w93cvvrlrz6jwdfsy261xl3xqs0ppchaa2igyxvxv5z5"; - }) - (fetchpatch { - name = "0003-main-channel-Prevent-overflow-reading-messages-from.patch"; - url = "https://cgit.freedesktop.org/spice/spice/patch/?id=1d3e26c0ee75712fa4bbbcfa09d8d5866b66c8af"; - sha256 = "030mm551aipck99rqiz39vsvk071pn8715zynr5j6chwzgpflwm3"; - }) - ]; - buildInputs = [ pixman celt alsaLib openssl libjpeg zlib libXrandr libXfixes libXrender libXext libXinerama python pyparsing glib cyrus_sasl lz4 ]; From b42cf67084bc647db7fd35441e375875d9ef0bbc Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Sat, 9 Jun 2018 07:17:14 +0000 Subject: [PATCH 2/2] xen: enable parallel building --- pkgs/applications/virtualization/xen/generic.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/virtualization/xen/generic.nix b/pkgs/applications/virtualization/xen/generic.nix index 0cbf30bea741..6d0344d46865 100644 --- a/pkgs/applications/virtualization/xen/generic.nix +++ b/pkgs/applications/virtualization/xen/generic.nix @@ -221,6 +221,8 @@ stdenv.mkDerivation (rec { done ''; + enableParallelBuilding = true; + # TODO(@oxij): Stop referencing args here meta = { homepage = http://www.xen.org/;