JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
129,822 Commits 2 Branches 0 Tags 13 GiB
05de674d24
Commit Graph

66 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
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
923bf0a3ff mpv: major update, incl. build fix with new ffmpeg 
CC @AndersonTorres. The real build fix is in previous minor updates,
but I see no reason not to have the major updates as well.
 2014-07-21 10:05:50 +02:00
Mateusz Kowalczyk
6fa0f4f904 Bump mpv to 0.3.8 2014-04-25 18:59:50 +00:00
AndersonTorres
31a94915d2 mpv: minor updates and cleanup 
E.g. parameterize lua.
 2014-04-20 19:46:21 +02:00
AndersonTorres
193dd39d8c mpv: update to stable version 0.3.7 
Also:
* minor waf update (reflecting bootstrap.py)
* lua5_sockets inclusion (not detected yet)
 2014-04-20 19:46:21 +02:00
Evgeny Egorochkin
5d34b323a5 mpv: update from 0.3.2 to 0.3.7 2014-04-03 10:46:02 +03:00
Peter Simons
ceb7673bf0 Fix broken references to 'maintainers' attribute set. 2014-03-22 10:01:42 +01:00
AndersonTorres
f7498e5a7e Adding info about maintainer (myself - AndersonTorres) and modifying the meta.license field for some packages I have made. 2014-03-22 01:12:48 -03:00
Lluís Batlle i Rossell
cb35bf15a4 ffmpeg: adding gnutls support 
I also take out the useless 'openssl' I added by error to mpv.
 2014-01-15 17:04:14 +01:00
Lluís Batlle i Rossell
f046d9bd08 mpv: updating to 0.3.2. 2014-01-15 16:40:04 +01:00
Lluís Batlle i Rossell
a7a7e414f0 Updating mpv, and making it use ffmpeg_2 2013-12-22 19:00:05 +01:00
AndersonTorres
e34aea6178 It is a first try to an expression for MPV video player. 
It certainly needs a bit of improvement and testing, but it works
nicely - so it's a good time to put it to the great public!
 2013-12-14 20:47:05 +01:00
AndersonTorres
ed05981c8a It is a first try to an expression for MPV video player. 
It certainly needs a bit of improvement and testing, but it works
nicely - so it's a good time to put it to the great public!
 2013-12-14 19:46:30 +01:00