commit 5ca9faa109b24ffdc51214f65674920f64873cc6

pyrox.dev / nixpkgs

lol

fork atom

xen: cleanup

Weijia Wang 2 years ago 5ca9faa1 5aac9028

+7 -8

2 changed files

expand all

unified split

pkgs

applications

virtualization

xen

4.15.nix

generic.nix

+2 -3

pkgs/applications/virtualization/xen/4.15.nix

··· 3 , withInternalQemu ? true 4 , withInternalTraditionalQemu ? true 5 , withInternalSeabios ? true 6 - , withSeabios ? !withInternalSeabios, seabios ? null 7 , withInternalOVMF ? false # FIXME: tricky to build 8 , withOVMF ? false, OVMF 9 , withLibHVM ? false ··· 179 }; 180 181 })) ({ 182 - ocamlPackages = ocaml-ng.ocamlPackages_4_05; 183 - pythonPackages = python3Packages; 184 } // args)

··· 3 , withInternalQemu ? true 4 , withInternalTraditionalQemu ? true 5 , withInternalSeabios ? true 6 + , withSeabios ? !withInternalSeabios, seabios 7 , withInternalOVMF ? false # FIXME: tricky to build 8 , withOVMF ? false, OVMF 9 , withLibHVM ? false ··· 179 }; 180 181 })) ({ 182 + ocamlPackages = ocaml-ng.ocamlPackages_4_14; 183 } // args)

+5 -5

pkgs/applications/virtualization/xen/generic.nix

··· 5 , bison, bzip2, checkpolicy, dev86, figlet, flex, gettext, glib 6 , acpica-tools, libaio, libiconv, libuuid, ncurses, openssl, perl 7 , xz, yajl, zlib 8 - , pythonPackages 9 10 # Xen Optional 11 , ocamlPackages ··· 16 , util-linux, procps, systemd 17 18 # Documentation 19 - # pythonPackages.markdown 20 , fig2dev, ghostscript, texinfo, pandoc 21 22 , binutils-unwrapped ··· 71 72 # Xen 73 bison bzip2 checkpolicy dev86 figlet flex gettext glib acpica-tools libaio 74 - libiconv libuuid ncurses openssl perl pythonPackages.python xz yajl zlib 75 76 # oxenstored 77 ocamlPackages.findlib ocamlPackages.ocaml systemd 78 79 # Python fixes 80 - pythonPackages.wrapPython 81 82 # Documentation 83 - pythonPackages.markdown fig2dev ghostscript texinfo pandoc 84 85 # Others 86 ] ++ (concatMap (x: x.buildInputs or []) (attrValues config.xenfiles))

··· 5 , bison, bzip2, checkpolicy, dev86, figlet, flex, gettext, glib 6 , acpica-tools, libaio, libiconv, libuuid, ncurses, openssl, perl 7 , xz, yajl, zlib 8 + , python3Packages 9 10 # Xen Optional 11 , ocamlPackages ··· 16 , util-linux, procps, systemd 17 18 # Documentation 19 + # python3Packages.markdown 20 , fig2dev, ghostscript, texinfo, pandoc 21 22 , binutils-unwrapped ··· 71 72 # Xen 73 bison bzip2 checkpolicy dev86 figlet flex gettext glib acpica-tools libaio 74 + libiconv libuuid ncurses openssl perl python3Packages.python xz yajl zlib 75 76 # oxenstored 77 ocamlPackages.findlib ocamlPackages.ocaml systemd 78 79 # Python fixes 80 + python3Packages.wrapPython 81 82 # Documentation 83 + python3Packages.markdown fig2dev ghostscript texinfo pandoc 84 85 # Others 86 ] ++ (concatMap (x: x.buildInputs or []) (attrValues config.xenfiles))