Add additional packages that flora depends on

Whether some of these packages should be included is up for debate (namely git pulled ones), but this allows flora to be built with 9.6.x (with some small changes) and use hls from devtools.