Follow upstream mtl and Cabal, add transformers package (#5958)

5 files changed, 45 insertions, 0 deletions

diff --git a/.gitignore b/.gitignore
index e65a4c26ec..2bbf8004be 100644
--- a/.gitignore
+++ b/.gitignore
@@ -74,6 +74,7 @@ _darcs/
 /libraries/stm/
 /libraries/template-haskell/
 /libraries/terminfo/
+/libraries/transformers
 /libraries/unix/
 /libraries/utf8-string/
 /libraries/vector/
diff --git a/ghc.mk b/ghc.mk
index a8c8cee638..195310bef6 100644
--- a/ghc.mk
+++ b/ghc.mk
@@ -419,6 +419,7 @@ $(eval $(call addPackage,Cabal/Cabal))
 $(eval $(call addPackage,binary))
 $(eval $(call addPackage,bin-package-db))
 $(eval $(call addPackage,hoopl))
+$(eval $(call addPackage,transformers))
 $(eval $(call addPackage,mtl))
 $(eval $(call addPackage,utf8-string))
 $(eval $(call addPackage,xhtml))
diff --git a/mk/validate-settings.mk b/mk/validate-settings.mk
index fa5add53a1..b8a48394b9 100644
--- a/mk/validate-settings.mk
+++ b/mk/validate-settings.mk
@@ -95,9 +95,15 @@ libraries/hoopl/src/Compiler/Hoopl/XUtil_HC_OPTS += -Wwarn
 libraries/hoopl/src/Compiler/Hoopl/Pointed_HC_OPTS += -Wwarn
 libraries/hoopl/src/Compiler/Hoopl/Passes/Dominator_HC_OPTS += -Wwarn
 
+# temporarily turn off -Werror for mtl
+libraries/mtl_dist-install_EXTRA_HC_OPTS += -Wwarn
+
 # primitive has a warning about deprecated use of GHC.IOBase
 libraries/primitive_dist-install_EXTRA_HC_OPTS += -Wwarn
 
+# temporarily turn off -Werror for transformers
+libraries/transformers_dist-install_EXTRA_HC_OPTS += -Wwarn
+
 # vector has some unused match warnings
 libraries/vector_dist-install_EXTRA_HC_OPTS += -Wwarn
 
diff --git a/packages b/packages
index 8eae5dd4d9..e565bb4cfc 100644
--- a/packages
+++ b/packages
@@ -70,6 +70,7 @@ libraries/pretty                -           packages/pretty.git
 libraries/process               -           packages/process.git                git
 libraries/template-haskell      -           packages/template-haskell.git       git
 libraries/terminfo              -           packages/terminfo.git               git
+libraries/transformers          -           packages/transformers.git           git
 libraries/unix                  -           packages/unix.git                   git
 libraries/utf8-string           -           packages/utf8-string.git            git
 libraries/Win32                 -           packages/Win32.git                  git
diff --git a/sync-all b/sync-all
index 87186de15c..7c1989277f 100755
--- a/sync-all
+++ b/sync-all
@@ -769,6 +769,42 @@ EOF
         chdir($pwd);
     }
 
+    message "== Checking for old mtl repo";
+    if (-d "libraries/mtl/.git") {
+        chdir("libraries/mtl");
+        if ((system "git log -1 c67d8f7247c612dc35242bc67e616f7ea35eadb9 > /dev/null 2> /dev/null") == 0) {
+            print <<EOF;
+============================
+ATTENTION!
+
+You have an old mtl repository in your GHC tree!
+
+Please remove it (e.g. "rm -r libraries/mtl"), and then run
+"./sync-all get" to get the new repository.
+============================
+EOF
+        }
+        chdir($pwd);
+    }
+
+    message "== Checking for old Cabal repo";
+    if (-d "libraries/Cabal/.git") {
+        chdir("libraries/Cabal");
+        if ((system "git log -1 c8ebd66a32865f72ae03ee0663c62df3d77f08fe > /dev/null 2> /dev/null") == 0) {
+            print <<EOF;
+============================
+ATTENTION!
+
+You have an old Cabal repository in your GHC tree!
+
+Please remove it (e.g. "rm -r libraries/Cabal"), and then run
+"./sync-all get" to get the new repository.
+============================
+EOF
+        }
+        chdir($pwd);
+    }
+
     $? = $ec;
 }