branch master updated (c7fbf61 -> a60dbad)

[guix-commits]

mbakke pushed a change to branch master
in repository guix.

      from  c7fbf61   gnu: Remove leftover patch.
      adds  5f9f2c8   build-system/haskell: Fix Haddock phase docstring.
      adds  ed8d3f3   build-system/haskell: Generate Setup.hs if needed.
       new  a60dbad   Merge branch 'staging'

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 gnu/packages/haskell.scm            | 42 -------------------------------------
 guix/build/haskell-build-system.scm | 14 ++++++++++++-
 2 files changed, 13 insertions(+), 43 deletions(-)