diff options
author | Peter Simons <simons@cryp.to> | 2013-12-16 21:13:24 +0100 |
---|---|---|
committer | Peter Simons <simons@cryp.to> | 2013-12-16 21:13:24 +0100 |
commit | 45e8de9a7d457e5202d17fcbf4a6c58afa3388e8 (patch) | |
tree | 35ce6756899dca5d77087fa2f06c781f42a9a6a3 /pkgs/applications/audio | |
parent | 2bc29e4e6d3713d106de670b55e8789267f7acc7 (diff) | |
parent | 60103a4bd99cce63dab60be358e0ba90724b8b21 (diff) | |
download | nixlib-45e8de9a7d457e5202d17fcbf4a6c58afa3388e8.tar nixlib-45e8de9a7d457e5202d17fcbf4a6c58afa3388e8.tar.gz nixlib-45e8de9a7d457e5202d17fcbf4a6c58afa3388e8.tar.bz2 nixlib-45e8de9a7d457e5202d17fcbf4a6c58afa3388e8.tar.lz nixlib-45e8de9a7d457e5202d17fcbf4a6c58afa3388e8.tar.xz nixlib-45e8de9a7d457e5202d17fcbf4a6c58afa3388e8.tar.zst nixlib-45e8de9a7d457e5202d17fcbf4a6c58afa3388e8.zip |
Merge branch 'origin/master' into stdenv-updates.
Conflicts: pkgs/tools/misc/less/default.nix
Diffstat (limited to 'pkgs/applications/audio')
-rw-r--r-- | pkgs/applications/audio/a2jmidid/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/audio/bristol/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/audio/lingot/default.nix | 6 | ||||
-rw-r--r-- | pkgs/applications/audio/moc/default.nix | 21 | ||||
-rw-r--r-- | pkgs/applications/audio/mpg123/default.nix | 6 |
5 files changed, 31 insertions, 10 deletions
diff --git a/pkgs/applications/audio/a2jmidid/default.nix b/pkgs/applications/audio/a2jmidid/default.nix index f6c17e6d8ed5..9dbdada07d49 100644 --- a/pkgs/applications/audio/a2jmidid/default.nix +++ b/pkgs/applications/audio/a2jmidid/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "a2jmidid-${version}"; - version = "7"; + version = "8"; src = fetchurl { url = "http://download.gna.org/a2jmidid/${name}.tar.bz2"; - sha256 = "1pl91y7npirhmikzlizpbyx2vkfvdkvc6qvc2lv4capj3cp6ypx7"; + sha256 = "0pzm0qk5ilqhwz74pydg1jwrds27vm47185dakdrxidb5bv3b5ia"; }; buildInputs = [ alsaLib dbus jackaudio pkgconfig python ]; diff --git a/pkgs/applications/audio/bristol/default.nix b/pkgs/applications/audio/bristol/default.nix index 0978b15bfaf0..5eb4f0c4e9f1 100644 --- a/pkgs/applications/audio/bristol/default.nix +++ b/pkgs/applications/audio/bristol/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "bristol-${version}"; - version = "0.60.10"; + version = "0.60.11"; src = fetchurl { url = "mirror://sourceforge/bristol/${name}.tar.gz"; - sha256 = "070rn5zdx6vrqmq7w1rrpxig3bxlylbsw82nlmkjnhjrgm6yx753"; + sha256 = "1fi2m4gmvxdi260821y09lxsimq82yv4k5bbgk3kyc3x1nyhn7vx"; }; buildInputs = [ diff --git a/pkgs/applications/audio/lingot/default.nix b/pkgs/applications/audio/lingot/default.nix index 44d946af2dbd..4b8ba4dbc242 100644 --- a/pkgs/applications/audio/lingot/default.nix +++ b/pkgs/applications/audio/lingot/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, intltool, gtk, alsaLib, libglade }: stdenv.mkDerivation { - name = "lingot-0.9.0"; + name = "lingot-0.9.1"; src = fetchurl { - url = mirror://savannah/lingot/lingot-0.9.0.tar.gz; - sha256 = "07z129lp8m4sz608q409wb11c639w7cbn497r7bscgg08p6c07xb"; + url = mirror://savannah/lingot/lingot-0.9.1.tar.gz; + sha256 = "0ygras6ndw2fylwxx86ac11pcr2y2bcfvvgiwrh92z6zncx254gc"; }; buildInputs = [ pkgconfig intltool gtk alsaLib libglade ]; diff --git a/pkgs/applications/audio/moc/default.nix b/pkgs/applications/audio/moc/default.nix new file mode 100644 index 000000000000..de29f2d53e74 --- /dev/null +++ b/pkgs/applications/audio/moc/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, ncurses, pkgconfig, alsaLib, flac, libmad, speex, ffmpeg, libvorbis, mpc, libsndfile, jackaudio, db4, libav, libmodplug, timidity, libid3tag, libtool }: + +stdenv.mkDerivation rec { + name = "moc-${version}"; + version = "2.5.0-beta1"; + + src = fetchurl { + url = "http://ftp.daper.net/pub/soft/moc/unstable/moc-${version}.tar.bz2"; + sha256 = "076816da9c6d1e61a386a1dda5f63ee2fc84bc31e9011ef70acc1d391d4c46a6"; + }; + + configurePhase = "./configure prefix=$out"; + + buildInputs = [ ncurses pkgconfig alsaLib flac libmad speex ffmpeg libvorbis mpc libsndfile jackaudio db4 libav 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."; + homepage = http://moc.daper.net/; + license = stdenv.lib.licenses.gpl2; + }; +} diff --git a/pkgs/applications/audio/mpg123/default.nix b/pkgs/applications/audio/mpg123/default.nix index 029c2ba4bcdf..f14e2764211e 100644 --- a/pkgs/applications/audio/mpg123/default.nix +++ b/pkgs/applications/audio/mpg123/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, alsaLib }: stdenv.mkDerivation { - name = "mpg123-1.15.4"; + name = "mpg123-1.16.0"; src = fetchurl { - url = mirror://sourceforge/mpg123/mpg123-1.15.4.tar.bz2; - sha256 = "05aizspky9mp1bq2lfrkjzrsnjykl7gkbrhn93xcarj5b2izv1b8"; + url = mirror://sourceforge/mpg123/mpg123-1.16.0.tar.bz2; + sha256 = "1lznnfdvg69a9qbbhvhfc9i86hxdmdqx67lvbkqbh8mmhpip43zh"; }; buildInputs = stdenv.lib.optional (!stdenv.isDarwin) alsaLib; |