[commit: ghc] wip/nfs-locking: Drop integerGmp2 and clean up. (efe9d6f)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : wip/nfs-locking
Link       : http://ghc.haskell.org/trac/ghc/changeset/efe9d6fa2c26d2befc6dcd97eadef5474f94c6e7/ghc

>---------------------------------------------------------------

commit efe9d6fa2c26d2befc6dcd97eadef5474f94c6e7
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Fri Aug 21 16:12:27 2015 +0100

    Drop integerGmp2 and clean up.


>---------------------------------------------------------------

efe9d6fa2c26d2befc6dcd97eadef5474f94c6e7
 src/Settings/Default.hs | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/Settings/Default.hs b/src/Settings/Default.hs
index 5a021e7..71698da 100644
--- a/src/Settings/Default.hs
+++ b/src/Settings/Default.hs
@@ -3,8 +3,8 @@ module Settings.Default (
 
     array, base, binPackageDb, binary, bytestring, cabal, compiler, containers,
     deepseq, directory, filepath, ghcPrim, haskeline, hoopl, hpc, integerGmp,
-    integerGmp2, integerSimple, parallel, pretty, primitive, process, stm,
-    templateHaskell, terminfo, time, transformers, unix, win32, xhtml
+    integerSimple, parallel, pretty, primitive, process, stm, templateHaskell,
+    terminfo, time, transformers, unix, win32, xhtml
     ) where
 
 import Stage
@@ -29,12 +29,16 @@ defaultTargetDirectory stage package
 defaultKnownPackages :: [Package]
 defaultKnownPackages =
     [ array, base, binPackageDb, binary, bytestring, cabal, compiler
-    , containers, deepseq, directory, filepath, ghcPrim, haskeline
-    , hoopl, hpc, integerGmp, integerGmp2, integerSimple, parallel
-    , pretty, primitive, process, stm, templateHaskell, terminfo, time
-    , transformers, unix, win32, xhtml ]
+    , containers, deepseq, directory, filepath, ghcPrim, haskeline, hoopl, hpc
+    , integerGmp, integerSimple, parallel, pretty, primitive, process, stm
+    , templateHaskell, terminfo, time, transformers, unix, win32, xhtml ]
 
 -- Package definitions
+array, base, binPackageDb, binary, bytestring, cabal, compiler, containers,
+    deepseq, directory, filepath, ghcPrim, haskeline, hoopl, hpc, integerGmp,
+    integerSimple, parallel, pretty, primitive, process, stm, templateHaskell,
+    terminfo, time, transformers, unix, win32, xhtml :: Package
+
 array           = library  "array"
 base            = library  "base"
 binPackageDb    = library  "bin-package-db"
@@ -51,7 +55,6 @@ haskeline       = library  "haskeline"
 hoopl           = library  "hoopl"
 hpc             = library  "hpc"
 integerGmp      = library  "integer-gmp"
-integerGmp2     = library  "integer-gmp"    `setPath` "libraries/integer-gmp2"
 integerSimple   = library  "integer-simple"
 parallel        = library  "parallel"
 pretty          = library  "pretty"