haskell-xmobar: update to version 0.22.1

This commit is contained in:
Peter Simons 2014-10-12 16:12:27 +02:00
parent 61ea009f3b
commit 258a47fcc7
3 changed files with 10 additions and 21 deletions

View file

@ -1,23 +1,23 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, alsaCore, alsaMixer, dbus, filepath, hinotify, HTTP
, libmpd, libXrandr, mtl, parsec, regexCompat, stm, time
, timezoneOlson, timezoneSeries, utf8String, wirelesstools, X11
, X11Xft, libXpm
, libmpd, libXpm, libXrandr, mtl, parsec, regexCompat, stm, time
, timezoneOlson, timezoneSeries, transformers, utf8String
, wirelesstools, X11, X11Xft
}:
cabal.mkDerivation (self: {
pname = "xmobar";
version = "0.22";
sha256 = "158q2mcdn58jjli3wh3zlcjchrzz9krdgvx39n8qdl6a9pgmf8bd";
version = "0.22.1";
sha256 = "0mnwwcfk0xf4fi3cnw19s6lxcg8sbsdlvg7zwvf5xf0y9q365swz";
isLibrary = false;
isExecutable = true;
buildDepends = [
alsaCore alsaMixer dbus filepath hinotify HTTP libmpd mtl parsec
regexCompat stm time timezoneOlson timezoneSeries utf8String X11
X11Xft
regexCompat stm time timezoneOlson timezoneSeries transformers
utf8String X11 X11Xft
];
extraLibraries = [ libXrandr wirelesstools libXpm ];
extraLibraries = [ libXpm libXrandr wirelesstools ];
configureFlags = "-fall_extensions";
meta = {
homepage = "http://xmobar.org";

View file

@ -2698,19 +2698,6 @@ let
xmltv = callPackage ../tools/misc/xmltv { };
xmobar = let haskellPackagesExt = haskellPackages.override {
extension = self : super : {
# We need to disable tests unfortunately because doctest
# does not work with transformers-overrides, because it
# uses the GHC API.
cabal = super.cabal.override { enableCheckPhase = false; };
transformers = self.transformers_0_4_1_0;
mtl = self.mtl_2_2_1;
};
};
in haskellPackagesExt.callPackage ../applications/misc/xmobar {};
xmpppy = builderDefsPackage (import ../development/python-modules/xmpppy) {
inherit python setuptools;
};

View file

@ -3069,6 +3069,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
xlsx = callPackage ../development/libraries/haskell/xlsx {};
xmobar = callPackage ../applications/misc/xmobar {};
xmonad = callPackage ../applications/window-managers/xmonad {};
xmonadContrib = callPackage ../applications/window-managers/xmonad/xmonad-contrib.nix {};