Add upstream repo to the packages file

diff --git a/boot b/boot
index 6683ad5..54209af 100644 (file)
--- a/boot
+++ b/boot
@@ -21,7 +21,7 @@ while (<PACKAGES>) {
     if (/^#/) {
         # Comment; do nothing
     }
-    elsif (/^([a-zA-Z0-9\/.-]+) *([^ ]+) *[^ ]+ *[^ ]+$/) {
+    elsif (/^([a-zA-Z0-9\/.-]+) +([^ ]+) +[^ ]+ +[^ ]+ +[^ ]+$/) {
         $dir = $1;
         $tag = $2;
         

diff --git a/darcs-all b/darcs-all
index 9eee3c6..5ced5b7 100644 (file)
--- a/darcs-all
+++ b/darcs-all
@@ -166,7 +166,7 @@ sub darcsall {
 
     foreach (@repos) {
         chomp;
-        if (/^([^# ]+) +([^ ]+) +([^ ]+) +([^ ]+)$/) {
+        if (/^([^# ]+) +([^ ]+) +([^ ]+) +([^ ]+) +([^ ]+)$/) {
             $localpath = $1;
             $tag = $2;
             $remotepath = $3;
@@ -227,7 +227,7 @@ sub darcsget {
 
     foreach (@repos) {
         chomp;
-        if (/^([^ ]+) +([^ ]+) +([^ ]+) +([^ ]+)$/) {
+        if (/^([^ ]+) +([^ ]+) +([^ ]+) +([^ ]+) +([^ ]+)$/) {
             $localpath = $1;
             $tag = $2;
             $remotepath = $3;

diff --git a/packages b/packages
index 53d1a21..fe9326c 100644 (file)
--- a/packages
+++ b/packages
@@ -17,54 +17,60 @@
 #    - nofib and testsuite are optional helpers
 #
 # The format of the lines in this file is:
-#   localpath    tag    remotepath    VCS
+#   localpath    tag    remotepath    VCS    upstream
 # where
-#   * 'localpath' is where to put the repository in a checked out tree,
-#   * 'remotepath' is where the repository is in the central repository,
-#   * 'VCS' is what version control system the repo uses,
+#   * 'localpath' is where to put the repository in a checked out tree.
+#   * 'remotepath' is where the repository is in the central repository.
+#   * 'VCS' is what version control system the repo uses.
 #   * The 'tag' determines when "darcs-all get" will get the
 #     repo. If the tag is "-" then it will always get it, but if there
 #     is a tag then a corresponding flag must be given to darcs-all, e.g.
 #     if you want to get the packages with an "extralibs" or "testsuite"
 #     tag then you need to use "darcs-all --extra --testsuite get".
 #     Support for new tags must be manually added to the darcs-all script.
+#   * 'upstream' is the URL of the upstream repo, where there is one, or
+#     "-" if there is no upstream.
 #
 # Lines that start with a '#' are comments.
-.                               -           ghc                             git
-ghc-tarballs                    -           ghc-tarballs                    darcs
-utils/hsc2hs                    -           hsc2hs                          darcs
-utils/haddock                   -           haddock2                        darcs
-libraries/array                 -           packages/array                  darcs
-libraries/base                  -           packages/base                   darcs
-libraries/binary                -           packages/binary                 darcs
-libraries/bytestring            -           packages/bytestring             darcs
-libraries/Cabal                 -           packages/Cabal                  darcs
-libraries/containers            -           packages/containers             darcs
-libraries/directory             -           packages/directory              darcs
-libraries/dph                   -           packages/dph                    darcs
-libraries/extensible-exceptions -           packages/extensible-exceptions  darcs
-libraries/filepath              -           packages/filepath               darcs
-libraries/ghc-prim              -           packages/ghc-prim               darcs
-libraries/haskeline             -           packages/haskeline              darcs
-libraries/haskell98             -           packages/haskell98              darcs
-libraries/haskell2010           -           packages/haskell2010            darcs
-libraries/hpc                   -           packages/hpc                    darcs
-libraries/integer-gmp           -           packages/integer-gmp            darcs
-libraries/integer-simple        -           packages/integer-simple         darcs
-libraries/mtl                   -           packages/mtl                    darcs
-libraries/old-locale            -           packages/old-locale             darcs
-libraries/old-time              -           packages/old-time               darcs
-libraries/pretty                -           packages/pretty                 darcs
-libraries/process               -           packages/process                darcs
-libraries/random                -           packages/random                 darcs
-libraries/template-haskell      -           packages/template-haskell       darcs
-libraries/terminfo              -           packages/terminfo               darcs
-libraries/unix                  -           packages/unix                   darcs
-libraries/utf8-string           -           packages/utf8-string            darcs
-libraries/Win32                 -           packages/Win32                  darcs
-libraries/xhtml                 -           packages/xhtml                  darcs
-testsuite                       testsuite   testsuite                       darcs
-nofib                           nofib       nofib                           darcs
-libraries/deepseq               extra       packages/deepseq                darcs
-libraries/parallel              extra       packages/parallel               darcs
-libraries/stm                   extra       packages/stm                    darcs
+.                               -           ghc                             git     -
+ghc-tarballs                    -           ghc-tarballs                    darcs   -
+utils/hsc2hs                    -           hsc2hs                          darcs   -
+# haddock does have an upstream:
+#   http://code.haskell.org/haddock/
+# but it stays buildable with the last stable release rather than tracking HEAD,
+# and is resynced with the GHC HEAD branch by David Waern when appropriate
+utils/haddock                   -           haddock2                        darcs   -
+libraries/array                 -           packages/array                  darcs   -
+libraries/base                  -           packages/base                   darcs   -
+libraries/binary                -           packages/binary                 darcs   http://code.haskell.org/binary/
+libraries/bytestring            -           packages/bytestring             darcs   http://darcs.haskell.org/bytestring/
+libraries/Cabal                 -           packages/Cabal                  darcs   http://darcs.haskell.org/cabal/
+libraries/containers            -           packages/containers             darcs   -
+libraries/directory             -           packages/directory              darcs   -
+libraries/dph                   -           packages/dph                    darcs   -
+libraries/extensible-exceptions -           packages/extensible-exceptions  darcs   -
+libraries/filepath              -           packages/filepath               darcs   -
+libraries/ghc-prim              -           packages/ghc-prim               darcs   -
+libraries/haskeline             -           packages/haskeline              darcs   http://code.haskell.org/haskeline/
+libraries/haskell98             -           packages/haskell98              darcs   -
+libraries/haskell2010           -           packages/haskell2010            darcs   -
+libraries/hpc                   -           packages/hpc                    darcs   -
+libraries/integer-gmp           -           packages/integer-gmp            darcs   -
+libraries/integer-simple        -           packages/integer-simple         darcs   -
+libraries/mtl                   -           packages/mtl                    darcs   -
+libraries/old-locale            -           packages/old-locale             darcs   -
+libraries/old-time              -           packages/old-time               darcs   -
+libraries/pretty                -           packages/pretty                 darcs   -
+libraries/process               -           packages/process                darcs   -
+libraries/random                -           packages/random                 darcs   -
+libraries/template-haskell      -           packages/template-haskell       darcs   -
+libraries/terminfo              -           packages/terminfo               darcs   http://code.haskell.org/terminfo/
+libraries/unix                  -           packages/unix                   darcs   -
+libraries/utf8-string           -           packages/utf8-string            darcs   http://code.haskell.org/utf8-string/
+libraries/Win32                 -           packages/Win32                  darcs   -
+libraries/xhtml                 -           packages/xhtml                  darcs   -
+testsuite                       testsuite   testsuite                       darcs   -
+nofib                           nofib       nofib                           darcs   -
+libraries/deepseq               extra       packages/deepseq                darcs   -
+libraries/parallel              extra       packages/parallel               darcs   -
+libraries/stm                   extra       packages/stm                    darcs   -