Skip to content

update: xmobar, moc; add: lastfmsubmitd, haskell-alsa-mixer #1392

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
jagajaga wants to merge 13 commits into from
Closed

update: xmobar, moc; add: lastfmsubmitd, haskell-alsa-mixer #1392

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
99e7215
Add haskell alsa-mixer lib
jagajaga Dec 17, 2013
68efd1a
xmobar alsa support
jagajaga Dec 17, 2013
429a8b9
Merge branch 'master' of https://github.com/NixOS/nixpkgs
jagajaga Dec 19, 2013
2831da7
Merge branch 'master' of https://github.com/NixOS/nixpkgs
jagajaga Dec 22, 2013
76bc908
Merge branch 'master' of https://github.com/NixOS/nixpkgs
jagajaga Dec 23, 2013
022d77b
Merge branch 'master' of https://github.com/NixOS/nixpkgs
jagajaga Dec 24, 2013
6fdefa5
Merge branch 'master' of https://github.com/NixOS/nixpkgs
jagajaga Dec 26, 2013
6c63411
Merge branch 'master' of https://github.com/NixOS/nixpkgs
jagajaga Dec 26, 2013
639f524
Merge branch 'master' of https://github.com/NixOS/nixpkgs
jagajaga Dec 28, 2013
a38f9e7
Merge branch 'master' of https://github.com/NixOS/nixpkgs
jagajaga Dec 28, 2013
dce0539
moc: fix mp3 playback and remove useless lib
jagajaga Dec 28, 2013
ffef6e0
add lastfmsubmitd
jagajaga Jan 2, 2014
0232f83
Merge branch 'master' of https://github.com/NixOS/nixpkgs
jagajaga Jan 2, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions pkgs/applications/audio/lastfmsubmitd/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{ stdenv, fetchurl, pythonPackages }:

pythonPackages.buildPythonPackage rec {
name = "lastfmsubmitd-${version}";
namePrefix = "";
version = "1.0.6";

src = fetchurl {
url = "http://www.red-bean.com/decklin/lastfmsubmitd/lastfmsubmitd-${version}.tar.gz";
sha256 = "c2636d5095a95167366bacd458624d67b046e060244fa54ba2c2e3efb79f9b0e";
};

doCheck = false;

installCommand = "python setup.py install --prefix=$out";

meta = {
homepage = "http://www.red-bean.com/decklin/lastfmsubmitd/";
description = "An last.fm audio scrobbler and daemon";
};
}
4 changes: 2 additions & 2 deletions pkgs/applications/audio/moc/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, ncurses, pkgconfig, alsaLib, flac, libmad, speex, ffmpeg, libvorbis, mpc, libsndfile, jackaudio, db4, libav, libmodplug, timidity, libid3tag, libtool }:
{ stdenv, fetchurl, ncurses, pkgconfig, alsaLib, flac, libmad, speex, ffmpeg_0_10, libvorbis, mpc, libsndfile, jackaudio, db4, libmodplug, timidity, libid3tag, libtool }:

stdenv.mkDerivation rec {
name = "moc-${version}";
Expand All @@ -11,7 +11,7 @@ stdenv.mkDerivation rec {

configurePhase = "./configure prefix=$out";

buildInputs = [ ncurses pkgconfig alsaLib flac libmad speex ffmpeg libvorbis mpc libsndfile jackaudio db4 libav libmodplug timidity libid3tag libtool ];
buildInputs = [ ncurses pkgconfig alsaLib flac libmad speex ffmpeg_0_10 libvorbis mpc libsndfile jackaudio db4 libmodplug timidity libid3tag libtool ];

meta = {
description = "MOC (music on console) is a console audio player for LINUX/UNIX designed to be powerful and easy to use.";
Expand Down
6 changes: 3 additions & 3 deletions pkgs/applications/misc/xmobar/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{ cabal, filepath, libXrandr, mtl, parsec, regexCompat, stm, time
, utf8String, wirelesstools, X11, X11Xft
, utf8String, wirelesstools, X11, X11Xft, alsaCore, alsaMixer
}:

cabal.mkDerivation (self: {
Expand All @@ -11,8 +11,8 @@ cabal.mkDerivation (self: {
buildDepends = [
filepath mtl parsec regexCompat stm time utf8String X11 X11Xft
];
extraLibraries = [ libXrandr wirelesstools ];
configureFlags = "-fwith_xft -fwith_iwlib";
extraLibraries = [ libXrandr wirelesstools alsaCore alsaMixer ];
configureFlags = "-fwith_xft -fwith_iwlib -fwith_alsa";
Copy link
Contributor

@ocharles ocharles Jan 11, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

None of this is strictly true - xmobar doesn't depend on alsaCore without flags. I think this should be configurable, but I'm not sure how best to achieve that.

meta = {
homepage = "http://projects.haskell.org/xmobar/";
description = "A Minimalistic Text Based Status Bar";
Expand Down
15 changes: 15 additions & 0 deletions pkgs/development/libraries/haskell/alsa-mixer/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{ cabal, alsaLib, alsaCore, extensibleExceptions, c2hs }:

cabal.mkDerivation (self: {
pname = "alsa-mixer";
version = "0.1.2";
sha256 = "081f3a62f83a269d72e0b0fac8bae8c81e9ec342d592fa25abe57f7206cf4414";
buildDepends = [ extensibleExceptions alsaCore c2hs ];
pkgconfigDepends = [ alsaLib ];
Copy link
Contributor

@ocharles ocharles Jan 11, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think you need to submit a patch to https://github.com/NixOS/cabal2nix/blob/c5547bbdd8be7cba20375c0a039684a121f91ba1/src/Cabal2Nix/Name.hs for this too. @peti could you confirm libNixName is the right place for this?

meta = {
homepage = "http://hackage.haskell.org/package/alsa-mixer";
description = "This package provides bindings to the ALSA simple mixer API.";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.stdenv.lib.platforms.linux;
};
})
2 changes: 2 additions & 0 deletions pkgs/top-level/all-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8327,6 +8327,8 @@ let

lastwatch = callPackage ../applications/audio/lastwatch { };

lastfmsubmitd = callPackage ../applications/audio/lastfmsubmitd { };

lbdb = callPackage ../tools/misc/lbdb { };

lci = callPackage ../applications/science/logic/lci {};
Expand Down
2 changes: 2 additions & 0 deletions pkgs/top-level/haskell-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -530,6 +530,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x

alsaCore = callPackage ../development/libraries/haskell/alsa-core {};

alsaMixer = callPackage ../development/libraries/haskell/alsa-mixer {};

alsaPcm = callPackage ../development/libraries/haskell/alsa-pcm {};

amqp = callPackage ../development/libraries/haskell/amqp {};
Expand Down