[commit: ghc] master: Update Cabal source-repository entries (re #8545) (386e874)

[git at git.haskell.org]

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

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/386e874e365e310214b701e6f3cb74b4f75348f4/ghc

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

commit 386e874e365e310214b701e6f3cb74b4f75348f4
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Sat Apr 19 20:20:26 2014 +0200

    Update Cabal source-repository entries (re #8545)
    
    This adapts the source-repository entries to match the new situation of
    base.git, ghc-prim.git, integer-gmp.git, integer-simple.git, and
    template-haskell.git being folded into ghc.git
    
    Signed-off-by: Herbert Valerio Riedel <hvr at gnu.org>


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

386e874e365e310214b701e6f3cb74b4f75348f4
 libraries/base/base.cabal                         |    3 ++-
 libraries/ghc-prim/ghc-prim.cabal                 |    8 ++------
 libraries/integer-gmp/integer-gmp.cabal           |    8 ++------
 libraries/integer-simple/integer-simple.cabal     |    3 ++-
 libraries/template-haskell/template-haskell.cabal |    8 ++------
 5 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/libraries/base/base.cabal b/libraries/base/base.cabal
index 22b40db..a70a661 100644
--- a/libraries/base/base.cabal
+++ b/libraries/base/base.cabal
@@ -39,7 +39,8 @@ extra-source-files:
 
 source-repository head
     type:     git
-    location: http://git.haskell.org/packages/base.git
+    location: http://git.haskell.org/ghc.git
+    subdir:   libraries/base
 
 Flag integer-simple
     Description: Use integer-simple
diff --git a/libraries/ghc-prim/ghc-prim.cabal b/libraries/ghc-prim/ghc-prim.cabal
index ffb32af..c861342 100644
--- a/libraries/ghc-prim/ghc-prim.cabal
+++ b/libraries/ghc-prim/ghc-prim.cabal
@@ -14,12 +14,8 @@ description:
 
 source-repository head
     type:     git
-    location: http://git.haskell.org/packages/ghc-prim.git
-
-source-repository this
-    type:     git
-    location: http://git.haskell.org/packages/ghc-prim.git
-    tag:      ghc-prim-0.3.1.0-release
+    location: http://git.haskell.org/ghc.git
+    subdir:   libraries/ghc-prim
 
 flag include-ghc-prim
     Description: Include GHC.Prim in exposed-modules
diff --git a/libraries/integer-gmp/integer-gmp.cabal b/libraries/integer-gmp/integer-gmp.cabal
index 817a854..c0f6b60 100644
--- a/libraries/integer-gmp/integer-gmp.cabal
+++ b/libraries/integer-gmp/integer-gmp.cabal
@@ -47,12 +47,8 @@ extra-tmp-files:
 
 source-repository head
     type:     git
-    location: http://git.haskell.org/packages/integer-gmp.git
-
-source-repository this
-    type:     git
-    location: http://git.haskell.org/packages/integer-gmp.git
-    tag:      integer-gmp-0.5.1.0-release
+    location: http://git.haskell.org/ghc.git
+    subdir:   libraries/integer-gmp
 
 Library
     default-language: Haskell2010
diff --git a/libraries/integer-simple/integer-simple.cabal b/libraries/integer-simple/integer-simple.cabal
index 11c58dc..fa41c24 100644
--- a/libraries/integer-simple/integer-simple.cabal
+++ b/libraries/integer-simple/integer-simple.cabal
@@ -12,7 +12,8 @@ build-type: Simple
 
 source-repository head
     type:     git
-    location: http://git.haskell.org/packages/integer-simple.git
+    location: http://git.haskell.org/ghc.git
+    subdir:   libraries/integer-simple
 
 Library {
     build-depends: ghc-prim
diff --git a/libraries/template-haskell/template-haskell.cabal b/libraries/template-haskell/template-haskell.cabal
index d3cf0cc..ca0e344 100644
--- a/libraries/template-haskell/template-haskell.cabal
+++ b/libraries/template-haskell/template-haskell.cabal
@@ -18,12 +18,8 @@ description:
 
 source-repository head
     type:     git
-    location: http://git.haskell.org/packages/template-haskell.git
-
-source-repository this
-    type:     git
-    location: http://git.haskell.org/packages/template-haskell.git
-    tag:      template-haskell-2.10.0.0-release
+    location: http://git.haskell.org/ghc.git
+    subdir:   libraries/template-haskell
 
 Library
     default-language: Haskell2010