Switch back to using bytestring from the darcs repo; partially fixes #3855

diff --git a/darcs-all b/darcs-all
index b190fa0..72aff54 100644 (file)
--- a/darcs-all
+++ b/darcs-all
@@ -340,6 +340,20 @@ EOF
         }
     }
 
+    message "== Checking for bytestring tarball";
+    if (-d "libraries/bytestring" && not -d "libraries/bytestring/_darcs") {
+        print <<EOF;
+============================
+ATTENTION!
+
+You have an old bytestring in your GHC tree!
+
+Please remove it (e.g. "rm -r libraries/bytestring"), and then run
+"./darcs-all get" to get the darcs repository.
+============================
+EOF
+    }
+
     message "== Checking for unpulled tarball patches";
     if ((system "darcs annotate --match 'hash 20090930200358-3fd76-cab3bf4a0a9e3902eb6dd41f71712ad3a6a9bcd1' > /dev/null 2> /dev/null") == 0) {
         print <<EOF;

diff --git a/libraries/tarballs/bytestring-0.9.1.5.tar.gz b/libraries/tarballs/bytestring-0.9.1.5.tar.gz
deleted file mode 100644 (file)
index 313d773..0000000
Binary files a/libraries/tarballs/bytestring-0.9.1.5.tar.gz and /dev/null differ

diff --git a/packages b/packages
index 6550c0c..33748a0 100644 (file)
--- a/packages
+++ b/packages
@@ -37,6 +37,7 @@ 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