summary refs log tree commit diff
path: root/pkgs/applications/window-managers/xmonad
diff options
context:
space:
mode:
authorAndres Löh <mail@andres-loeh.de>2011-03-12 17:28:15 +0000
committerAndres Löh <mail@andres-loeh.de>2011-03-12 17:28:15 +0000
commit3e0ac9b040b0a15041faa74e7ffa87cc705e0f96 (patch)
treebc7a2b1c5f9269c77d3c710c1d489ae65cf3ad50 /pkgs/applications/window-managers/xmonad
parent03b3d85fbf9327e00a8b4506a2fa4dee7c947461 (diff)
downloadnixlib-3e0ac9b040b0a15041faa74e7ffa87cc705e0f96.tar
nixlib-3e0ac9b040b0a15041faa74e7ffa87cc705e0f96.tar.gz
nixlib-3e0ac9b040b0a15041faa74e7ffa87cc705e0f96.tar.bz2
nixlib-3e0ac9b040b0a15041faa74e7ffa87cc705e0f96.tar.lz
nixlib-3e0ac9b040b0a15041faa74e7ffa87cc705e0f96.tar.xz
nixlib-3e0ac9b040b0a15041faa74e7ffa87cc705e0f96.tar.zst
nixlib-3e0ac9b040b0a15041faa74e7ffa87cc705e0f96.zip
Major Haskell packages overhaul.
Several changes, some highlights:

  * Structure of haskell-packages.nix updated. It's now easier to
    select different default versions of packages for different
    versions of GHC.

  * GHC 7.0.2 is now default.

  * Haskell Platform 2011.2.0.0 has been added and is now default.

  * Several packages have been updated
    (gtk2hs, gitit, xmonad, darcs, ...).

  * Some old packages have been removed.

svn path=/nixpkgs/trunk/; revision=26288
Diffstat (limited to 'pkgs/applications/window-managers/xmonad')
-rw-r--r--pkgs/applications/window-managers/xmonad/default.nix9
-rw-r--r--pkgs/applications/window-managers/xmonad/xmonad-contrib.nix5
2 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/applications/window-managers/xmonad/default.nix b/pkgs/applications/window-managers/xmonad/default.nix
index 52cfe1e9798d..5380db40c022 100644
--- a/pkgs/applications/window-managers/xmonad/default.nix
+++ b/pkgs/applications/window-managers/xmonad/default.nix
@@ -1,11 +1,12 @@
-{cabal, X11, mtl, xmessage}:
+{cabal, X11, mtl, xmessage, syb}:
 
 cabal.mkDerivation (self : {
   pname = "xmonad";
   name = "${self.fname}";
-  version = "0.9.1";
-  sha256 = "014201200e8a521ee3a0d8c0727392916a7549207b91064fb456f8c660609927";
-  propagatedBuildInputs = [X11 mtl];
+  version = "0.9.2";
+  sha256 = "07w5k3pqmybjn0zh2nr1glp69685xg2fhj3z9zxb37x5nzss7kdd";
+  noHaddock = true;
+  propagatedBuildInputs = [X11 mtl syb];
   meta = {
     description = "xmonad is a tiling window manager for X";
     homepage = http://xmonad.org/;
diff --git a/pkgs/applications/window-managers/xmonad/xmonad-contrib.nix b/pkgs/applications/window-managers/xmonad/xmonad-contrib.nix
index 1c0619356e05..a8b39e6e5b0d 100644
--- a/pkgs/applications/window-managers/xmonad/xmonad-contrib.nix
+++ b/pkgs/applications/window-managers/xmonad/xmonad-contrib.nix
@@ -2,9 +2,8 @@
 
 cabal.mkDerivation (self : {
   pname = "xmonad-contrib";
-  name = "${self.fname}";
-  version = "0.9.1";
-  sha256 = "b4ca1d71d12903be76187ce58898697086e7af3ef73468987cb7ef03b076ec47";
+  version = "0.9.2";
+  sha256 = "06hg5j4w8iz62wmyygq4c7xcbi9dxlhhh3dbic438cjk7c0w1h5p";
   propagatedBuildInputs = [X11 xmonad utf8String X11Xft];
   meta = {
     description = "a huge extension library for xmonad";