aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDon Stewart <dons@galois.com>2007-10-30 23:08:24 +0100
committerDon Stewart <dons@galois.com>2007-10-30 23:08:24 +0100
commit83f03ba4ac20b5b90df80f8dcc26a40a7c228172 (patch)
treeb79b6ad70b2c98a5e75ed9e5fdb70874534480d5
parent8d4b78d87798a568d5551da254cf6501813eabef (diff)
downloadxmonad-83f03ba4ac20b5b90df80f8dcc26a40a7c228172.tar.gz
xmonad-83f03ba4ac20b5b90df80f8dcc26a40a7c228172.tar.xz
xmonad-83f03ba4ac20b5b90df80f8dcc26a40a7c228172.zip
HEADS UP: remove X11-extras dependency, depend on X11 >
The X11-extras library has been merged into the larger X11 library, so we now drop the dependency on X11-extras, and instead build against the new X11 library. If you apply this patch you must build and install X11-1.3.0 or greater first, http://hackage.haskell.org/cgi-bin/hackage-scripts/package/X11-1.3.0 You can also go ahead and wipe X11-extras from GHC's memory, (for ghci to work out of the box with the testsuite) $ ghc-pkg unregister X11-extras $ ghc-pkg unregister --user X11-extras darcs-hash:20071030220824-cba2c-b601d2fbc7fcb1e46784a358f67f436d224701c4.gz
Diffstat (limited to '')
-rw-r--r--README15
-rw-r--r--xmonad.cabal2
2 files changed, 8 insertions, 9 deletions
diff --git a/README b/README
index 7f2b3c0..92254c8 100644
--- a/README
+++ b/README
@@ -62,10 +62,9 @@ Get the dependencies
provided. To check whether you've got a package run 'ghc-pkg list
some_package_name'. You will need the following packages:
- mtl http://hackage.haskell.org/cgi-bin/hackage-scripts/package/mtl-1.0
- unix http://hackage.haskell.org/cgi-bin/hackage-scripts/package/unix-2.0
- X11 http://hackage.haskell.org/cgi-bin/hackage-scripts/package/X11-1.2.3
- X11-extras: http://hackage.haskell.org/cgi-bin/hackage-scripts/package/X11-extras-0.4
+ mtl http://hackage.haskell.org/cgi-bin/hackage-scripts/package/mtl-1.0
+ unix http://hackage.haskell.org/cgi-bin/hackage-scripts/package/unix-2.0
+ X11 http://hackage.haskell.org/cgi-bin/hackage-scripts/package/X11-1.3.0
And then build xmonad with Cabal as follows (the same goes for the other
Haskell libraries):
@@ -79,12 +78,12 @@ Haskell libraries):
Notes for using the darcs version
If you're building the darcs version of xmonad, be sure to also
- use the darcs version of X11-extras, which is developed concurrently
- with xmonad.
+ use the darcs version of the X11 library, which is developed
+ concurrently with xmonad.
- darcs get http://code.haskell.org/X11-extras
+ darcs get http://darcs.haskell.org/X11
- Not using X11-extras from darcs, is the most common reason for the
+ Not using X11 from darcs is the most common reason for the
darcs version of xmonad to fail to build.
------------------------------------------------------------------------
diff --git a/xmonad.cabal b/xmonad.cabal
index dc01570..0ef9bcd 100644
--- a/xmonad.cabal
+++ b/xmonad.cabal
@@ -17,7 +17,7 @@ license: BSD3
license-file: LICENSE
author: Spencer Janssen
maintainer: sjanssen@cse.unl.edu
-build-depends: base>=2.0, X11>=1.2.1, X11-extras>=0.4, mtl>=1.0, unix>=1.0
+build-depends: base>=2.0, X11>=1.3.0, mtl>=1.0, unix>=1.0
extra-source-files: README TODO tests/loc.hs tests/Properties.hs man/xmonad.1.in
Config.hs-boot util/GenerateManpage.hs man/xmonad.1 man/xmonad.html