This reverts commit bdb51a36.

Herbert Valerio Riedel authored May 21, 2017 and Mikhail Glushenkov committed Nov 03, 2017

(cherry picked from commit 0a28ab6a)

Version range refactor

Add s/cmm-sources + extra-bundled-libraries

Apply 'any' qualifier to new-freeze constraints (fixes #4832).

Adds defaultMainWithHooksNoReadArgs

'makeAbsolute' is not compatible with old versions of 'directory' and
we know at this place in the code that the directory we refer to does
exist, so the potential exception is not a problem.

Fixes #4606.

(cherry picked from commit 560903cf)

Not absolutely happy with this solution. I fail to come up with a better one though.
The issue is that for some libraries, you might want to have _debug, _p, _l, as well as _thr_debug, _thr_p, _thr_l flavours.

# Conflicts:
#	Cabal/Distribution/PackageDescription/Parsec/FieldDescr.hs

# Conflicts:
#	Cabal/Distribution/PackageDescription/Check.hs
#	Cabal/Distribution/PackageDescription/Parsec/FieldDescr.hs
#	Cabal/Distribution/Parsec/Types/FieldDescr.hs
#	Cabal/doc/developing-packages.rst

new-install: nonlocal exes

[ci skip]

RFC: Relax coding guideline regarding module imports

This is a refactoring abstracting `FlagAssignment` while retaining its
external appearance as much as possible (i.e. same Read/Show/Binary
instances etc).

Later we can attach new instances, enforce internal invariants (like
e.g. uniqueness of flagnames), switch out the internal
representation (maybe to `Data.Map`), etc more easily.

Implement native DNS hackage-security bootstrap via resolv/windns packages

I notice imports like

    import qualified Text.PrettyPrint as Disp
          ( Doc, render, char, text )

which seem overly precise to me, when `Disp.` is only used
locally as a module prefix, and there's no other imports sharing
the same module prefix.

Instead, it should suffice to either use

    import qualified Text.PrettyPrint as Disp

or

    import Text.PrettyPrint
          ( Doc, render, char, text )

or in rare cases even

    import Text.PrettyPrint as Disp
          ( Doc, render, char, text )

Hence this relaxes the coding guidelines to allow these simpler forms
to be used.

[skip ci]

...via the new @windns@ package (which provides a compatible subset
of the @resolv@ API)

The flag is renamed from `resolv` to `native-dns`

This avoids calling out to an external `nslookup` program and having
to screen scrape its output. The `resolv` library supports all
platforms which provide the ubiquitous `libresolv` API.

This is hidden behind the manual cabal flag `resolv` which is
currently disabled by default.

RFC: Potential fix for #4808

pure -> return

Adds `new-update`

doc: Makefile, Add proper source link, Add to new-freeze

- Fix Makefile to work on arch where we need to use sphinx-build2
- README: mention python 2 and use Makefile
- html output now properly links to github source
- new-freeze documentation fixed for the --project-file case

fixes #4833, #4834 [ci skip]

new-freeze produces constraints that allow all versions of each package from the
install plan, in order to constrain setup and build tool dependencies without
using qualified constraints. Since the constraints should apply to top-level,
setup, and build tool dependencies, they should use an 'any' qualifier.