diff options
author | Austin Seipp <aseipp@pobox.com> | 2014-05-17 16:45:03 -0500 |
---|---|---|
committer | Austin Seipp <aseipp@pobox.com> | 2014-05-17 16:45:03 -0500 |
commit | 9d2a85badbb18195b5d62f2b2f9923685aa6aec3 (patch) | |
tree | b3f7c074e63ec23b081a4020101617ddecee2267 /pkgs | |
parent | a0c6f07be4c58dfcf898de6f4a4ac7831f9409c0 (diff) | |
parent | a7b67d93c12a72e1b22734755014adee056e4257 (diff) | |
download | nixlib-9d2a85badbb18195b5d62f2b2f9923685aa6aec3.tar nixlib-9d2a85badbb18195b5d62f2b2f9923685aa6aec3.tar.gz nixlib-9d2a85badbb18195b5d62f2b2f9923685aa6aec3.tar.bz2 nixlib-9d2a85badbb18195b5d62f2b2f9923685aa6aec3.tar.lz nixlib-9d2a85badbb18195b5d62f2b2f9923685aa6aec3.tar.xz nixlib-9d2a85badbb18195b5d62f2b2f9923685aa6aec3.tar.zst nixlib-9d2a85badbb18195b5d62f2b2f9923685aa6aec3.zip |
Merge pull request #2677 from bennofs/xmobar-mpd
haskell-xmobar: build with mpd support
Diffstat (limited to 'pkgs')
3 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/applications/misc/xmobar/default.nix b/pkgs/applications/misc/xmobar/default.nix index a7aeed339e24..d631b28a67f0 100644 --- a/pkgs/applications/misc/xmobar/default.nix +++ b/pkgs/applications/misc/xmobar/default.nix @@ -1,5 +1,5 @@ { cabal, alsaCore, alsaMixer, filepath, HTTP, libXrandr, mtl -, parsec, regexCompat, stm, time, utf8String, wirelesstools, X11 +, parsec, regexCompat, stm, time, utf8String, wirelesstools, X11, libmpd , X11Xft }: @@ -11,10 +11,10 @@ cabal.mkDerivation (self: { isExecutable = true; buildDepends = [ alsaCore alsaMixer filepath HTTP mtl parsec regexCompat stm time - utf8String X11 X11Xft + utf8String X11 X11Xft libmpd ]; extraLibraries = [ libXrandr wirelesstools ]; - configureFlags = "-fwith_xft -fwith_iwlib -fwith_alsa"; + configureFlags = "-fwith_xft -fwith_iwlib -fwith_alsa -fwith_mpd"; meta = { homepage = "http://projects.haskell.org/xmobar/"; description = "A Minimalistic Text Based Status Bar"; diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 266ab11a39fb..682e7159ac8f 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -11,7 +11,7 @@ with stdenv.lib; let - version = "4.3.10"; # changes ./guest-additions as well + version = "4.3.12"; # changes ./guest-additions as well forEachModule = action: '' for mod in \ @@ -31,13 +31,13 @@ let ''; # See https://github.com/NixOS/nixpkgs/issues/672 for details - extpackRevision = "93012"; + extpackRevision = "93733"; extensionPack = requireFile rec { name = "Oracle_VM_VirtualBox_Extension_Pack-${version}-${extpackRevision}.vbox-extpack"; # IMPORTANT: Hash must be base16 encoded because it's used as an input to # VBoxExtPackHelperApp! # Tip: see http://dlc.sun.com.edgesuite.net/virtualbox/4.3.10/SHA256SUMS - sha256 = "ec3f2a98373d5e228acb4756ac07f44212c4d53f6b83deee81b791abb0d2608a"; + sha256 = "f931ce41b2cc9500dc43aba004630cf7bb7050ba737eae38827e91062f072d1f"; message = '' In order to use the extension pack, you need to comply with the VirtualBox Personal Use and Evaluation License (PUEL) by downloading the related binaries from: @@ -56,7 +56,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2"; - sha256 = "739835aee3274a663b23eeb748bd0430e8a5d8ba2f4d0eae5dc47ff2c485e23b"; + sha256 = "db84ddf47d1ecd316ec46417595f0252e3ec2f67e35e1e17320aba87b7c2934f"; }; buildInputs = diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index 5fc755904170..f168c0d57259 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso"; - sha256 = "247e15e9a205dcd4761f6cb547ceca2a61e8d6905c1930870939fd323f4cd1ae"; + sha256 = "c76dd5ec86f61ad72263ab6d2405723b06badfc2fae57f83ffa5de96f553400d"; }; KERN_DIR = "${kernel.dev}/lib/modules/*/build"; |