pyrox.dev
xen: cleanup
+2
-3
pkgs/applications/virtualization/xen/4.15.nix
+2
-3
pkgs/applications/virtualization/xen/4.15.nix
···
3
3
, withInternalQemu ? true
4
4
, withInternalTraditionalQemu ? true
5
5
, withInternalSeabios ? true
6
-
, withSeabios ? !withInternalSeabios, seabios ? null
6
+
, withSeabios ? !withInternalSeabios, seabios
7
7
, withInternalOVMF ? false # FIXME: tricky to build
8
8
, withOVMF ? false, OVMF
9
9
, withLibHVM ? false
···
179
179
};
180
180
181
181
})) ({
182
-
ocamlPackages = ocaml-ng.ocamlPackages_4_05;
183
-
pythonPackages = python3Packages;
182
+
ocamlPackages = ocaml-ng.ocamlPackages_4_14;
184
183
} // args)
+5
-5
pkgs/applications/virtualization/xen/generic.nix
+5
-5
pkgs/applications/virtualization/xen/generic.nix
···
5
5
, bison, bzip2, checkpolicy, dev86, figlet, flex, gettext, glib
6
6
, acpica-tools, libaio, libiconv, libuuid, ncurses, openssl, perl
7
7
, xz, yajl, zlib
8
-
, pythonPackages
8
+
, python3Packages
9
9
10
10
# Xen Optional
11
11
, ocamlPackages
···
16
16
, util-linux, procps, systemd
17
17
18
18
# Documentation
19
-
# pythonPackages.markdown
19
+
# python3Packages.markdown
20
20
, fig2dev, ghostscript, texinfo, pandoc
21
21
22
22
, binutils-unwrapped
···
71
71
72
72
# Xen
73
73
bison bzip2 checkpolicy dev86 figlet flex gettext glib acpica-tools libaio
74
-
libiconv libuuid ncurses openssl perl pythonPackages.python xz yajl zlib
74
+
libiconv libuuid ncurses openssl perl python3Packages.python xz yajl zlib
75
75
76
76
# oxenstored
77
77
ocamlPackages.findlib ocamlPackages.ocaml systemd
78
78
79
79
# Python fixes
80
-
pythonPackages.wrapPython
80
+
python3Packages.wrapPython
81
81
82
82
# Documentation
83
-
pythonPackages.markdown fig2dev ghostscript texinfo pandoc
83
+
python3Packages.markdown fig2dev ghostscript texinfo pandoc
84
84
85
85
# Others
86
86
] ++ (concatMap (x: x.buildInputs or []) (attrValues config.xenfiles))