1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-26 23:52:33 +00:00
Commit graph

16 commits

Author SHA1 Message Date
Vladimír Čunát 6295a3ca36 Merge recent master into x-updates
Hydra: ?compare=1142825

Conflicts (easy):
	pkgs/applications/audio/lmms/default.nix
	pkgs/desktops/e18/enlightenment.nix
	pkgs/games/exult/default.nix
	pkgs/os-specific/linux/alsa-plugins/default.nix
2014-08-02 05:08:07 +02:00
Bjørn Forsman 62d0a320b3 Revert "Remove obsolete jackaudio version 1."
This reverts commit bdb77826d9.

Jack1 is not obsolete and neither jack1 nor jack2 is called 'jackaudio'.

Q: What's the difference between Jack1 and Jack2?
A: http://trac.jackaudio.org/wiki/Q_differenc_jack1_jack2
2014-07-31 12:52:29 +02:00
Peter Simons bdb77826d9 Remove obsolete jackaudio version 1. 2014-07-28 20:32:52 +02:00
Mateusz Kowalczyk 7a45996233 Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
Bjørn Forsman f6f2f38a6e jack: change package and attr names to 'jack1' and 'jack2'
Currently, we have a 'jack' package with attrname 'jack1d' and a
'jackdbus' package with attrname 'jackaudio'. Make it consistent 'jack1'
and 'jack2' in both package name and attrname.

This aligns the naming with what can be found on the JACK homepage.

Q: what's the difference between jack1 and jack2?
A: http://trac.jackaudio.org/wiki/Q_differenc_jack1_jack2
2014-07-23 20:22:14 +02:00
Vladimír Čunát 3ec2cea214 Merge master into x-updates
Conflicts (auto-solved):
	pkgs/os-specific/linux/alsa-plugins/default.nix
2014-06-20 00:24:38 +02:00
Vladimír Čunát 1a1c83fa77 alsa{Lib,Plugins}: update to 1.28.0
Dropped unrecognized option, patch no longer applying, fixed licenses.
2014-06-19 20:24:23 +02:00
Rok Garbas 870a8a0833 alsa-plugins: upgrade to 1.0.28
adding libogg as dependency should fix the build
2014-06-19 16:06:03 +01:00
Bjørn Forsman d4e210539b alsa: bump 1.0.26 -> 1.0.27 (close #1198)
Basically, bump all alsa projects to their latest version as per
http://www.alsa-project.org/main/index.php/Main_Page
2013-11-11 22:32:28 +01:00
aszlig 9938f5267a
alsa-plugins: Update to upstream version 1.0.26.
Add alsa.cybermirror.org as an alternative URL because at the time of this
commit, ftp.alsa-project.org wasn't available.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-12-03 11:10:17 +01:00
Mathijs Kwik 100b95e57e alsa upgraded to 1.0.25
svn path=/nixpkgs/trunk/; revision=33777
2012-04-13 14:54:02 +00:00
Eelco Dolstra 65be4d7202 * alsa-plugins 1.0.24 seems to break the PulseAudio plugin (playback
in Audacious and Spotify stops after a second or so), so revert to
  1.0.23.

svn path=/nixpkgs/branches/kde-4.7/; revision=27957
2011-07-26 01:19:35 +00:00
Eelco Dolstra a8dc106b71 * alsa-plugins updated to 1.0.24.
svn path=/nixpkgs/branches/kde-4.7/; revision=27956
2011-07-26 00:05:10 +00:00
David Guibert 4e67eba80c update alsa-{lib,utils,plugins} to 1.0.23
svn path=/nixpkgs/trunk/; revision=22014
2010-05-27 19:33:52 +00:00
Marc Weber 8398a33112 pass jackaudio to alsaPlugins also adding convinient wrapper script
svn path=/nixpkgs/trunk/; revision=17340
2009-09-21 15:55:26 +00:00
Marc Weber 862fcb0252 adding alsa-plugin and patching alsa so that you can tell it about additional plugins
svn path=/nixpkgs/trunk/; revision=17316
2009-09-20 21:54:23 +00:00