nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-22 23:13:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #221232 from wegank/xen-cleanup

Browse Source 
xen: cleanup
This commit is contained in:
Weijia Wang 2023-03-15 01:26:17 +02:00 committed by GitHub
commit aba12ee4cd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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
, withInternalTraditionalQemu ? true
, withInternalSeabios ? true
, withSeabios ? !withInternalSeabios, seabios ? null
, withSeabios ? !withInternalSeabios, seabios
, withInternalOVMF ? false # FIXME: tricky to build
, withOVMF ? false, OVMF
, withLibHVM ? false
@ -179,6 +179,5 @@ callPackage (import ./generic.nix (rec {
};
})) ({
ocamlPackages = ocaml-ng.ocamlPackages_4_05;
pythonPackages = python3Packages;
ocamlPackages = ocaml-ng.ocamlPackages_4_14;
} // args)

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

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