From 99e7215907e046bc31aceeeba3efdbb51b418ff2 Mon Sep 17 00:00:00 2001 From: Arseniy Seroka Date: Tue, 17 Dec 2013 21:33:26 +0400 Subject: [PATCH 1/4] Add haskell alsa-mixer lib --- .../libraries/haskell/alsa-mixer/default.nix | 15 +++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 17 insertions(+) create mode 100644 pkgs/development/libraries/haskell/alsa-mixer/default.nix diff --git a/pkgs/development/libraries/haskell/alsa-mixer/default.nix b/pkgs/development/libraries/haskell/alsa-mixer/default.nix new file mode 100644 index 0000000000000..4f9bd6f65d65a --- /dev/null +++ b/pkgs/development/libraries/haskell/alsa-mixer/default.nix @@ -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 ]; + 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; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index f00ac24654626..7efc0848c5804 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -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 {}; From 68efd1a33263d8b286d3beca52cc47f69bf052e5 Mon Sep 17 00:00:00 2001 From: Arseniy Seroka Date: Tue, 17 Dec 2013 21:38:12 +0400 Subject: [PATCH 2/4] xmobar alsa support --- pkgs/applications/misc/xmobar/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/xmobar/default.nix b/pkgs/applications/misc/xmobar/default.nix index 7d4d2715d04a0..8ea034227d289 100644 --- a/pkgs/applications/misc/xmobar/default.nix +++ b/pkgs/applications/misc/xmobar/default.nix @@ -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: { @@ -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"; meta = { homepage = "http://projects.haskell.org/xmobar/"; description = "A Minimalistic Text Based Status Bar"; From dce0539d8be62ee0ab03ca71fc22c31bde8ef43f Mon Sep 17 00:00:00 2001 From: Arseniy Seroka Date: Sun, 29 Dec 2013 02:12:13 +0400 Subject: [PATCH 3/4] moc: fix mp3 playback and remove useless lib --- pkgs/applications/audio/moc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/moc/default.nix b/pkgs/applications/audio/moc/default.nix index de29f2d53e749..74ae3dcf22bb3 100644 --- a/pkgs/applications/audio/moc/default.nix +++ b/pkgs/applications/audio/moc/default.nix @@ -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}"; @@ -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."; From ffef6e079dab68c50468be0649d545a826232221 Mon Sep 17 00:00:00 2001 From: Arseniy Seroka Date: Thu, 2 Jan 2014 14:57:08 +0400 Subject: [PATCH 4/4] add lastfmsubmitd --- .../audio/lastfmsubmitd/default.nix | 21 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/applications/audio/lastfmsubmitd/default.nix diff --git a/pkgs/applications/audio/lastfmsubmitd/default.nix b/pkgs/applications/audio/lastfmsubmitd/default.nix new file mode 100644 index 0000000000000..314361329c75e --- /dev/null +++ b/pkgs/applications/audio/lastfmsubmitd/default.nix @@ -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"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cf9d64a1f0b3f..767ae7bad1acb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8319,6 +8319,8 @@ let lastwatch = callPackage ../applications/audio/lastwatch { }; + lastfmsubmitd = callPackage ../applications/audio/lastfmsubmitd { }; + lbdb = callPackage ../tools/misc/lbdb { }; lci = callPackage ../applications/science/logic/lci {};