remove php add haskell
update from upstream