colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xen: cleanup

Browse Source
This commit is contained in:
Weijia Wang 2023-03-15 00:54:37 +02:00
parent 5aac902848
commit 5ca9faa109
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/applications/virtualization/xen/4.15.nix
View File

@ -3,7 +3,7 @@
, withInternalQemu ? true , withInternalQemu ? true
, withInternalTraditionalQemu ? true , withInternalTraditionalQemu ? true
, withInternalSeabios ? true , withInternalSeabios ? true
, withSeabios ? !withInternalSeabios, seabios ? null , withSeabios ? !withInternalSeabios, seabios
, withInternalOVMF ? false # FIXME: tricky to build , withInternalOVMF ? false # FIXME: tricky to build
, withOVMF ? false, OVMF , withOVMF ? false, OVMF
, withLibHVM ? false , withLibHVM ? false
@ -179,6 +179,5 @@ callPackage (import ./generic.nix (rec {
}; };
})) ({ })) ({
ocamlPackages = ocaml-ng.ocamlPackages_4_05; ocamlPackages = ocaml-ng.ocamlPackages_4_14;
pythonPackages = python3Packages;
} // args) } // args)

10
pkgs/applications/virtualization/xen/generic.nix
View File

@ -5,7 +5,7 @@ config:
, bison, bzip2, checkpolicy, dev86, figlet, flex, gettext, glib , bison, bzip2, checkpolicy, dev86, figlet, flex, gettext, glib
, acpica-tools, libaio, libiconv, libuuid, ncurses, openssl, perl , acpica-tools, libaio, libiconv, libuuid, ncurses, openssl, perl
, xz, yajl, zlib , xz, yajl, zlib
, pythonPackages , python3Packages
# Xen Optional # Xen Optional
, ocamlPackages , ocamlPackages
@ -16,7 +16,7 @@ config:
, util-linux, procps, systemd , util-linux, procps, systemd
# Documentation # Documentation
# pythonPackages.markdown # python3Packages.markdown
, fig2dev, ghostscript, texinfo, pandoc , fig2dev, ghostscript, texinfo, pandoc
, binutils-unwrapped , binutils-unwrapped
@ -71,16 +71,16 @@ stdenv.mkDerivation (rec {
# Xen # Xen
bison bzip2 checkpolicy dev86 figlet flex gettext glib acpica-tools libaio bison bzip2 checkpolicy dev86 figlet flex gettext glib acpica-tools libaio
libiconv libuuid ncurses openssl perl pythonPackages.python xz yajl zlib libiconv libuuid ncurses openssl perl python3Packages.python xz yajl zlib
# oxenstored # oxenstored
ocamlPackages.findlib ocamlPackages.ocaml systemd ocamlPackages.findlib ocamlPackages.ocaml systemd
# Python fixes # Python fixes
pythonPackages.wrapPython python3Packages.wrapPython
# Documentation # Documentation
pythonPackages.markdown fig2dev ghostscript texinfo pandoc python3Packages.markdown fig2dev ghostscript texinfo pandoc
# Others # Others
] ++ (concatMap (x: x.buildInputs or []) (attrValues config.xenfiles)) ] ++ (concatMap (x: x.buildInputs or []) (attrValues config.xenfiles))