-
Notifications
You must be signed in to change notification settings - Fork 232
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
5 changed files
with
28 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
{ | ||
"url": "https://github.com/ghcjs/ghcjs", | ||
"rev": "88fc8b7993a7c06fa1a71dd8ea494330108fa397", | ||
"sha256": "066vqflvxfiiw8xy0fygdq8bdqmhdjfgpqibnyfcg0xlr9wsf2ld", | ||
"rev": "ecb5954b98cdaeb3d4097401c9c3551e7a6f69ce", | ||
"sha256": "09120brnd8n8psskq9f098n7wrlrbb2h7s703678a4gbl2xfglql", | ||
"fetchSubmodules": true | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
diff --git a/libraries/Cabal/Cabal/Distribution/Simple/GHCJS.hs b/libraries/Cabal/Cabal/Distribution/Simple/GHCJS.hs | ||
index 4ad5bb18c..5db4d27e7 100644 | ||
--- a/libraries/Cabal/Cabal/Distribution/Simple/GHCJS.hs | ||
+++ b/libraries/Cabal/Cabal/Distribution/Simple/GHCJS.hs | ||
@@ -317,13 +317,10 @@ checkPackageDbStack :: Verbosity -> PackageDBStack -> IO () | ||
checkPackageDbStack _ (GlobalPackageDB:rest) | ||
| GlobalPackageDB `notElem` rest = return () | ||
checkPackageDbStack verbosity rest | ||
- | GlobalPackageDB `notElem` rest = | ||
- die' verbosity $ "With current ghc versions the global package db is always used " | ||
- ++ "and must be listed first. This ghc limitation may be lifted in " | ||
- ++ "future, see http://ghc.haskell.org/trac/ghc/ticket/5977" | ||
-checkPackageDbStack verbosity _ = | ||
+ | GlobalPackageDB `elem` rest = | ||
die' verbosity $ "If the global package db is specified, it must be " | ||
++ "specified first and cannot be specified multiple times" | ||
+checkPackageDbStack _ _ = return () | ||
|
||
getInstalledPackages' :: Verbosity -> [PackageDB] -> ProgramDb | ||
-> IO [(PackageDB, [InstalledPackageInfo])] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters