Superficial changes from new cabal2nix version
Update base-prelude