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

Commits on Mar 5, 2018

  1. xen 4.8: fix gcc7-related build errors

    @xeji
    xeji committed Mar 5, 2018
    Copy the full SHA
    c84cf5f View commit details

  2. Merge pull request #36353 from xeji/xen-4-8 

    xen 4.8: fix gcc7-related build errors
    @Mic92
    Mic92 authored Mar 5, 2018
    Copy the full SHA
    c7a92f3 View commit details
Showing with 14 additions and 0 deletions.
  1. +14 −0 pkgs/applications/virtualization/xen/4.8.nix
14 changes: 14 additions & 0 deletions pkgs/applications/virtualization/xen/4.8.nix
View file
Original file line number Diff line number Diff line change
@@ -29,6 +29,18 @@ let

xsa = import ./xsa-patches.nix { inherit fetchpatch; };

xenlockprofpatch = (fetchpatch {
name = "xenlockprof-gcc7.patch";
url = "https://xenbits.xen.org/gitweb/?p=xen.git;a=patch;h=f49fa658b53580cf2ad354d2bf1796766cc11222";
sha256 = "1lvzfvkqirknivm8q4cg5byfqz49s16zjk65fkwl3kwb03chky70";
});

xenpmdpatch = (fetchpatch {
name = "xenpmd-gcc7.patch";
url = "https://xenbits.xen.org/gitweb/?p=xen.git;a=patch;h=2d78f78a14528752266982473c07118f1bc336e3";
sha256 = "1ki295pymbcfc64sjb9wqfwpv19p8vwgmnxankada3vm4fxg2rhq";
});

qemuDeps = [
udev pciutils xorg.libX11 SDL pixman acl glusterfs spice-protocol usbredir
alsaLib
@@ -158,6 +170,8 @@ callPackage (import ./generic.nix (rec {
XSA_249
XSA_250
XSA_251_48
xenlockprofpatch
xenpmdpatch
];

# Fix build on Glibc 2.24.