xen: 4.15 -> {4.16,4.17,4.18,4.19}

pkgs/applications/qubes/qubes-core-vchan-xen/default.nix

@@ -28,8 +28,9 @@ stdenv.mkDerivation rec {
     description = "Libraries required for the higher-level Qubes daemons and tools";
     homepage = "https://qubes-os.org";
     license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ _0x4A6F ];
+    maintainers = [ ];
     platforms = platforms.linux;
+    broken = true;
   };
 
 }

pkgs/applications/virtualization/xen/0000-fix-ipxe-src.4.15.patch → pkgs/applications/virtualization/xen/4.16/0000-xen-ipxe-src-4.16.patch

@@ -1,21 +1,21 @@
-hack to make etherboot use prefetched ipxe
+Hack to make etherboot use pre-fetched iPXE.
 
 diff --git a/tools/firmware/etherboot/Makefile b/tools/firmware/etherboot/Makefile
 index ed9e11305f..979a3acea8 100644
 --- a/tools/firmware/etherboot/Makefile
 +++ b/tools/firmware/etherboot/Makefile
 @@ -16,6 +16,7 @@ IPXE_TARBALL_URL ?= $(XEN_EXTFILES_URL)/ipxe-git-$(IPXE_GIT_TAG).tar.gz
- 
+
  D=ipxe
  T=ipxe.tar.gz
 +G=ipxe.git
- 
+
  ROMS = $(addprefix $D/src/bin/, $(addsuffix .rom, $(ETHERBOOT_NICS)))
  ROM = $D/src/bin/ipxe.bin
 @@ -41,9 +42,9 @@ $T:
  	fi
  	mv _$T $T
- 
+
 -$D/src/arch/i386/Makefile: $T Config
 -	rm -rf $D
 -	gzip -dc $T | tar xf -

pkgs/applications/virtualization/xen/4.16/default.nix

@@ -0,0 +1,49 @@
+{
+  lib,
+  fetchpatch,
+  callPackage,
+  ocaml-ng,
+  ...
+}@genericDefinition:
+
+let
+  upstreamPatches = import ../patches.nix {
+    inherit lib;
+    inherit fetchpatch;
+  };
+
+  upstreamPatchList = lib.lists.flatten [ upstreamPatches.XSA_458 ];
+in
+
+callPackage (import ../generic.nix {
+  branch = "4.16";
+  version = "4.16.6";
+  latest = false;
+  pkg = {
+    xen = {
+      rev = "4b33780de790bd438dd7cbb6143b410d94f0f049";
+      hash = "sha256-2kcmfKwBo3w1U5CSxLSYSteqvzcJaB+cA7keVb3amyA=";
+      patches = [ ./0000-xen-ipxe-src-4.16.patch ] ++ upstreamPatchList;
+    };
+    qemu = {
+      rev = "c02cb236b5e4a76cf74e641cc35a0e3ebd3e52f3";
+      hash = "sha256-LwlPry04az9QQowaDG2la8PYlGOUMbZaQAsCHxj+pwM=";
+      patches = [ ];
+    };
+    seaBIOS = {
+      rev = "d239552ce7220e448ae81f41515138f7b9e3c4db";
+      hash = "sha256-UKMceJhIprN4/4Xe4EG2EvKlanxVcEi5Qcrrk3Ogiik=";
+      patches = [ ];
+    };
+    ovmf = {
+      rev = "7b4a99be8a39c12d3a7fc4b8db9f0eab4ac688d5";
+      hash = "sha256-Qq2RgktCkJZBsq6Ch+6tyRHhme4lfcN7d2oQfxwhQt8=";
+      patches = [ ];
+    };
+    ipxe = {
+      rev = "3c040ad387099483102708bb1839110bc788cefb";
+      hash = "sha256-y2QdZEoGsGUQjrrvD8YRa8VoqcZSr4tjLM//I/MrsLI=";
+      patches = [ ];
+    };
+  };
+}) ({ ocamlPackages = ocaml-ng.ocamlPackages_4_14; } // genericDefinition)