Commit graph

518 commits

Author SHA1 Message Date
Rüdiger Sonderfeld
4de6b9a0c7 mplayer: Add GNU FriBiDi support.
This is required by new versions of SMPlayer and other distros seem to
enable it by default now as well.
2014-08-19 16:24:58 +02:00
Rüdiger Sonderfeld
033c9bd18c mplayer: Update to 1.1.1. 2014-08-19 15:19:06 +02:00
AndersonTorres
7a8cdc66a4 MPV: update to 0.5.0
Many thanks matejc for the commit!
2014-08-18 08:14:26 -03:00
AndersonTorres
526edcaf15 Aegisub: update to 3.2.0 2014-08-12 19:43:16 +02:00
Peter Simons
2d326e5032 Merge remote-tracking branch 'origin/master' into staging.
Conflicts:
	pkgs/desktops/e18/enlightenment.nix
2014-08-04 16:51:47 +02:00
Cillian de Róiste
4143d9dfef shotcut: remove obsolete patch 2014-08-03 11:46:08 +02:00
Cillian de Róiste
cc3b5291d9 shotcut: update from 14.07 to 14.08 2014-08-03 11:44:41 +02:00
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
Vladimír Čunát
be07584397 vlc: minor update 2014-07-30 09:31:24 +02:00
Cillian de Róiste
6259669355 SimpleScreenRecorder 0.2.2 -> 0.3.0 2014-07-29 00:15:53 +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
Eelco Dolstra
f64d84698e Merge remote-tracking branch 'origin/master' into staging
Conflicts:
	pkgs/applications/audio/espeak/edit.nix
	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-07-28 11:30:49 +02:00
Cillian de Róiste
ab7349711b Add Shotcut: A free, open source, cross-platform video editor
Includes a patch which has already been applied upstream:
mltframework/shotcut#31
2014-07-27 12:53:57 +02:00
Cillian de Róiste
2723681a59 Kdenlive: 0.9.6 -> 0.9.8, add frei0r plugins, add myself to the maintainers 2014-07-27 12:53:56 +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
b9045a7d96 Merge branch 'x-updates' into staging
...in preparation for a merge to master
2014-07-22 22:28:39 +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
Eelco Dolstra
40f7b0f9df Another attempt to eradicate ensureDir
See c556a6ea46.
2014-06-30 14:56:10 +02:00
Bjørn Forsman
4a5cf73caa cinelerra: don't repeat package name in meta.description 2014-06-22 22:49:32 +02:00
Domen Kožar
fb9c0d53b2 xbmc: 13.0 -> 13.1 2014-06-09 20:42:57 +02:00
Philip Lykke Carlsen
e87da7761a subtitleeditor, gstreamermm: new packages 2014-06-03 22:00:47 +02:00
Vladimír Čunát
97b9deaca5 Merge #2487: add handbrake and update/patch dependents 2014-05-27 21:08:51 +02:00
Vladimír Čunát
48458b1c96 handbrake: disable unfree faac, as it doesn't build with it 2014-05-27 21:07:59 +02:00
Vladimír Čunát
8e9ead8656 berlios.de probably shut down, replace it
The shutdown was announced years ago, only now it stopped working.
2014-05-18 13:30:27 +02:00
Vladimír Čunát
137eae0b55 Merge #2630: add and use fetchpatch
fetchpatch is fetchurl that determinizes the patch.
Some parts of generated patches change from time to time, e.g. see #1983 and
http://comments.gmane.org/gmane.linux.distributions.nixos/12815
Using fetchpatch should prevent the hash from changing.

Conflicts (auto-solved):
	pkgs/development/libraries/haskell/gitit/default.nix
2014-05-17 07:31:03 +02:00
AndersonTorres
64948222ba Aegisub: update to 3.1.3 (close #2550)
New dependencies: icu, intltool, boost (default = 1.55), wxGTK 3.0
Fixes a bug on Boost detection
@vcunat: minor refactoring.
2014-05-13 12:28:47 +02:00
Peter Simons
409de114d2 Merge pull request #2511 from AndersonTorres/aegisub-update
Aegisub: update to version 3.1.3
2014-05-05 10:52:45 +02:00
AndersonTorres
14152efc5f Aegisub: update to version 3.1.3 2014-05-04 23:53:56 -03:00
Domen Kožar
a9a3cbfae3 xbmc: 12.3 -> 13.0
- add support for vaapi, bluray
- depend on gnutls
- by default enable pulseaudio
2014-05-04 18:04:22 +02:00
Wout Mertens
d93b1f80c0 Add Handbrake 0.9.9: DVD ripper
This packaging splices off the unfree faac library and forces handbrake
to use the (more recent/patched) versions of libraries in Nixpkgs.
Produces the CLI HandbrakeCLI and optionally the GTK+ version ghb.
2014-05-04 01:56:49 +02:00
Mateusz Kowalczyk
6fa0f4f904 Bump mpv to 0.3.8 2014-04-25 18:59:50 +00:00
Eelco Dolstra
d304b277bd Silence some Hydra evaluation warnings 2014-04-24 15:40:55 +02:00
aszlig
396da20739
miro: Fix desktop schema GSettings path.
The real path of the schemas is:

$out/share/gsettings-schemas/gsettings-desktop-schemas-3.10.1/glib-2.0/schemas

While the previous approach was to load schemas from:

$out/share/glib-2.0/schemas

So, we're now relying on the setup hook of glib to find the right schema
path.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-04-22 10:32:54 +02:00
aszlig
65fcb8d503
miro: Fix parsing of youtube feeds.
Youtube feeds now don't append a "sig" query string argument anymore, so
all those feeds would fail without this patch. For the latter, a pull
request already exists on upstream at pculture/miro#428, so I guess we
can drop our patch upon release of the next new upstream bugfix release.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-04-22 06:14:01 +02: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
Michael Raskin
d31cf5329e Merge pull request #2075 from iyzsong/webkit
get rid of old webkit packages
2014-04-18 10:10:29 -07:00
Luca Bruno
82744e57d6 pitivi: fix gsettings schemas, depend upon gnome-desktop 2014-04-17 13:42:51 +02:00
Mathijs Kwik
3ada08785f avidemux: make faacSupport optional 2014-04-10 11:57:20 +02:00
Evgeny Egorochkin
5d34b323a5 mpv: update from 0.3.2 to 0.3.7 2014-04-03 10:46:02 +03:00
ambrop7@gmail.com
0b1e408b6b vlc: Build with VDPAU support (close #2096) 2014-04-02 23:14:18 +02:00
宋文武
ede097adcb miro: build with webkitgtk2 2014-04-01 11:11:46 +08:00
Shea Levy
1d0eb1ae47 Merge branch 'pitivi' of git://github.com/iyzsong/nixpkgs
add pitivi, gstreamer powered non-linear video editor
2014-03-29 00:43:36 -04:00
宋文武
96d78a2804 pitivi: fix icons 2014-03-27 11:01:24 +08:00
Cillian de Róiste
de3b5b4500 Add simplescreenrecorder: an excellent screen recorder for linux 2014-03-26 23:02:33 +01:00
Matej Cotman
13bc37ed3e vlc: ncurses support (close #2012) 2014-03-23 20:21:16 +01:00
宋文武
6a981b5141 add pitivi 0.93 2014-03-22 23:09:39 +08:00
Peter Simons
ceb7673bf0 Fix broken references to 'maintainers' attribute set. 2014-03-22 10:01:42 +01:00
Peter Simons
57db4ba855 Merge pull request #1998 from AndersonTorres/master
Maintainer and license modifications for some packages
2014-03-22 09:01:07 +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
Domen Kožar
d4b1250b6c remove prefix for kazam 2014-03-18 18:23:13 +01:00
Domen Kožar
e9f3199973 add gstreamer 1.0 setup-hook and use it where appropriate 2014-02-28 02:03:07 +01:00
Evgeny Egorochkin
d380290640 vlc: update from 2.1.3 to 2.1.4 2014-02-27 18:35:34 +02:00
Domen Kožar
65a34b7f85 add kazam 2014-02-27 16:37:35 +01:00
Domen Kožar
dfa8ac64ad miro: keep quotes 2014-02-20 01:19:16 +01:00
Domen Kožar
fae6079a01 adopt rest of the packages that were failing with the buildPythonPackage changes 2014-02-20 01:19:15 +01:00
Moritz Ulrich
c7eb4982f3 vlc: update from 2.1.2 to 2.1.3 2014-02-16 16:35:35 +01:00
Cillian de Róiste
3250375f20 Remove dvswitch: I don't use it, and it's broken 2014-02-16 01:19:16 +01:00
James Cook
6e6351a376 Merge remote-tracking branch 'official/master' into firefox_27 2014-02-07 17:31:54 -08:00
James Cook
8ef2cadca4 gnash: Hack to define nullptr as NULL, since some included mozilla headers seem to want nullptr 2014-02-07 17:28:02 -08:00
Vladimír Čunát
11914108aa gnash: fix CVE-2012-1175 by upstream patch 2014-02-06 20:33:53 +01:00
Evgeny Egorochkin
37b1c1481b bangarang: fix build with gcc 4.7 2014-02-02 07:43:56 +02:00
Petr Rockai
f88de3b091 quvi: Update the CLI tool to version 0.9.5. 2014-01-28 22:08:02 +01:00
Petr Rockai
5878ffa55b quvi: Update to current upstream (0.9.4). 2014-01-28 21:48:52 +01: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
William A. Kennington III
b05d8d8310 vlc: Update from 2.1.1 -> 2.1.2 2013-12-29 21:35:01 +01:00
Domen Kožar
5603e611a7 xbmc: 12.2 -> 12.3 2013-12-29 17:53:40 +01:00
AndersonTorres
378f962c0e Aegisub: New Package
Adding Aegisub: an advanced movie subtitle editor
2013-12-25 22:24:19 +01:00
Mathijs Kwik
56cf3c115f mplayer2: upgrade to git 04/28 2013-12-23 10:21:19 +01:00
Nixpkgs Monitor
ab32224e7b smplayer: update from 0.8.5 to 0.8.6 2013-12-23 05:19:26 +02: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
Chong Li
0e18b7cd97 Switched xbmc to pythonFull. Fixes python plugin errors. 2013-12-12 16:52:09 +01:00
Domen Kožar
c1df906704 vlc: specify meta.platforms 2013-12-08 19:19:11 +01:00
Domen Kožar
32cd0be64c vlc: add mkv support 2013-12-08 19:18:59 +01:00
Nixpkgs Monitor
67f41be3dd keymon: update from 1.13 to 1.16 2013-12-04 06:44:19 +02:00
Vladimír Čunát
ac6bc8c990 vlc: minor update 2.1.0 -> .1 2013-11-14 22:57:26 +01:00
Domen Kožar
2099a81487 xawtv: 3.95 -> 3.103
- package now builds on linux
- added linux platforms
- removed patches
2013-11-10 17:57:58 +01:00
Lluís Batlle i Rossell
1045df3197 Updating mkvtoolnix, libebml, libmatroska to latest versions. 2013-11-05 23:20:27 +01:00
Eelco Dolstra
a0e21fd1ca Mark more packages as broken 2013-11-04 21:11:00 +01:00
aszlig
df4a3cc9f9
miro: New package, version 6.0.
I actually had this breeding in my nixpkgs overrides for a year and only
recently took the time to fix it and thus revive my video feeds :-)

The package uses a patch which is removing the dependency on gconf and
switches to storage within a shelve in ~/.miro/config instead.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-10-28 20:48:50 +01:00
Bjørn Forsman
083d0890f5 More description fixes
* Remove package name
* Start with upper case letter
* Remove trailing period

Also reword some descriptions and move some long descriptions to
longDescription.

I'm not touching generated packages.
2013-10-06 12:01:38 +02:00
Domen Kožar
b7b79e7000 xbmc: enable webserver 2013-09-29 21:17:26 +02:00
Mathijs Kwik
d61285e658 upgrade gpac to more up-to-date svn 2013-09-28 22:00:03 +02:00
Domen Kožar
71d19afafd vlc: 2.0.8a -> 2.1.0 2013-09-26 16:37:58 +02:00
Peter Simons
682faad1a7 Merge pull request #987 from oxij/mplayer-fontconfig
mplayer: add fontconfig support
2013-09-18 08:08:24 -07:00
Jonas Hoersch
786ff721c8 vlc: update to version 2.0.8a
this new release together with an updated ffmpeg solves segfaults
errors, i was having for some videos.
2013-09-16 07:08:43 +02:00
Jan Malakhovski
afcda36c46 mplayer: add fontconfig support 2013-08-26 19:16:18 +00:00
Jonas Hoersch
e72c2ddee4 vlc: update to version 2.0.8 2013-08-19 22:03:54 +02:00
Evgeny Egorochkin
cea107c07f More mirror:// URL fixes 2013-07-14 03:31:12 +03:00
Peter Simons
2eb36d2a7a Merge pull request #669 from iyzsong/kmplayer
kmplayer: update to 0.11.3d
2013-07-01 02:54:13 -07:00
Eelco Dolstra
acba9240cd nixos.org/tarballs -> tarballs.nixos.org
It's currently the same machine, but tarballs.nixos.org should become
an S3/CloudFront site eventually.
2013-06-25 14:12:16 +02:00
Rickard Nilsson
97bf9fbbc8 xbmc: Make it read /etc/zoneinfo 2013-06-25 12:20:10 +02:00
Song Wenwu
f305fe1c02 kmplayer: minor fixes
Wrap mplayer into PATH
Remove unneeded dependency on gtk
2013-06-25 07:32:04 +08:00
Song Wenwu
4cad420d5c smplayer: add platform and set license to stdenv.lib.licenses.gpl3Plus 2013-06-23 21:26:43 +08:00
Song Wenwu
48e1e1cae6 add smplayer 0.8.5 2013-06-23 17:48:21 +08:00
Song Wenwu
c74b3e26f7 kmplayer: update to 0.11.3d 2013-06-23 14:53:18 +08:00
Michael Raskin
19530856ed Merge remote-tracking branch 'upstream/master' into x-updates
Conflicts:
	pkgs/development/libraries/cairo/default.nix
	pkgs/development/libraries/gdk-pixbuf/default.nix
	pkgs/development/libraries/gtk+/2.x.nix
	pkgs/misc/ghostscript/default.nix
	pkgs/top-level/all-packages.nix
2013-06-13 17:12:43 +04:00
Vladimír Čunát
f724a5314b flac: update, enable tests
Fix includes in VLC.
Tried a few other programs using it, seems fine.
2013-06-11 15:48:42 +02:00
Vladimír Čunát
7af694700c Merge branch 'master' into x-updates
Silently merged badly the firefox 20/21 things. I got that, hopefully
there aren't more (my nixos-rebuild dry-run finds no more errors).
2013-06-05 12:59:47 +02:00
Vladimír Čunát
341aadaba1 kdenlive+mlt: enabling some subcomponents, parallel builds 2013-06-05 00:30:44 +02:00
Vladimír Čunát
b770365574 ReRevert Merge x-updates into master
This reverts commit ec3965d8d0.

Conflicts (taken x-updates):
	pkgs/development/libraries/libgcrypt/default.nix
	pkgs/development/libraries/libgpg-error/default.nix
	pkgs/development/libraries/poppler/default.nix
2013-05-29 23:25:02 +02:00
Domen Kozar
afe180f74c xbmc: 12.1 -> 12.2 2013-05-26 20:53:20 +02:00
aszlig
b08d6a39f8
mplayer(2): Add support and library for bs2b.
This also adds a new package "libbs2b", which is needed in order to support
Bauer stereophonic-to-binaural DSP as an audio filter.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-05-25 19:01:43 +02:00
Vladimír Čunát
ec3965d8d0 Revert Merge x-updates into master due to mesa bloat
See #490 discussion.

This reverts commit 1278859d31, reversing
changes made to 0c020c98f9.

Conflicts:
	pkgs/desktops/xfce/core/xfce4-session.nix (take master)
	pkgs/lib/misc.nix (auto)
2013-05-09 14:03:35 +02:00
Vladimír Čunát
1278859d31 Merge branch 'master' into x-updates
Conflicts (just splitting version from name):
	pkgs/os-specific/linux/systemd/default.nix
2013-05-08 13:46:46 +02:00
Lluís Batlle i Rossell
ce7c7dece5 kdenlive: update to 0.9.6 2013-05-07 12:19:38 +02:00
Vladimír Čunát
8fc5fb6ecc Merge branch 'master' into x-updates 2013-05-01 08:14:15 +02:00
Mathijs Kwik
2f036a21d7 mkvtoolnix: upgrade to 6.2.0 2013-04-30 09:27:02 +02:00
Vladimír Čunát
5fce03c561 gnash: fix build via using pangox_compat 2013-04-18 11:28:03 +02:00
Mathijs Kwik
ca392fb8a9 vlc: upgrade to 2.0.6 2013-04-12 11:40:33 +02:00
Lluís Batlle i Rossell
d8f98d1a85 Adding avxsynth.
To add it, I also add ffms and log4cpp.
2013-04-10 15:12:37 +02:00
Mathijs Kwik
fd76305a9b vlc: enable support for the opus codec 2013-04-08 08:38:10 +02:00
Lluís Batlle i Rossell
48f534bce9 mplayer2: add reference to libXxf86vm
Otherwise, playing h264 with vdpau complains about not able to sync to vsync.
2013-04-05 10:45:03 +02:00
Lluís Batlle i Rossell
d0d4e66652 ffmpeg: update to 1.2 (and patching mplayer2)
Simple patch required by mplayer2 to build with ffmpeg 1.2.
2013-04-04 23:07:23 +02:00
Domen Kozar
16672fc8b1 xbmc: add pulse support, lame, avahi, libdvdcss 2013-04-01 17:13:00 +02:00
Lluís Batlle i Rossell
a76a9f783e Adding omxplayer, for the raspberrypi. 2013-03-29 21:54:29 +01:00
Domen Kozar
65057975c8 xbmc: bump to 12.1 2013-03-28 17:21:20 +01:00
Domen Kozar
acf4697a5f upgrade xbmc to 12.0 2013-03-12 01:35:16 +01:00
Domen Kozar
65a4f741fd Set platform and maintainer for xbmc pkg 2013-03-11 18:12:46 +01:00
Shea Levy
e13c058fd2 Merge branch 'makemkv.130223.0' of git://github.com/jcumming/nixpkgs
This adds the proprietary makemkv package to convert dvd and blu-ray
videos to mkv.

I've tested that it builds, nothing more.

Signed-off-by: Shea Levy <shea@shealevy.com>
2013-03-08 17:26:53 -05:00
Eelco Dolstra
674c51af3c Merge remote-tracking branch 'origin/master' into stdenv-updates 2013-03-07 19:33:52 +01:00
Mathijs Kwik
45aea0bf52 mkvtoolnix: upgrade to 6.1.0 2013-03-04 22:40:22 +01:00
Jack Cummings
58a9875789 missing semicolon, found after push.. 2013-03-01 01:26:19 -08:00
Sergey Mironov
bd49c22ea1 mplayer: install desktop icon when X11 is enabled 2013-03-01 00:20:52 +04:00
Jack Cummings
ae35f74dbe Add makemkv descriptions 2013-02-24 02:17:24 -08:00
Jack Cummings
dbc343c49a makemkv-1.8.0 2013-02-23 19:37:16 -08:00
Domen Kozar
6506f9b070 add nasm to xbmc dependencies 2013-02-16 23:23:15 +01:00
Eelco Dolstra
a25b27a7f8 buildNativeInputs -> nativeBuildInputs 2013-02-15 13:38:07 +01:00
Eelco Dolstra
2aa6f262cb Merge remote-tracking branch 'origin/master' into stdenv-updates 2013-02-15 13:36:34 +01:00
Lluís Batlle i Rossell
6ee6cd5ec9 Updates: kdenlive-0.9.4 mlt-0.8.8
Upstream kdenlive suggests mlt-0.8.8.
2013-02-14 20:06:54 +01:00
Lluís Batlle i Rossell
511f3b7a61 Adding mplayer2, a mplayer fork.
It can play files very well with "vdpau". It has a reworked
vdpau pipeline compared to mplayer1. Mplayer1 fails to play well in
my computer.
2013-01-31 00:26:30 +01:00
Eelco Dolstra
ecee1be7f1 RealPlayer: Remove
This package hasn't built in ages, is unfree, and is not needed
anymore.
2013-01-28 16:31:23 +01:00
Rickard Nilsson
0e8f9adb07 xbmc: Add libvdpau to LD_LIBRARY_PATH, so xbmc can find it at runtime 2013-01-21 19:05:08 +01:00
Eelco Dolstra
5bb548d2e4 Merge remote-tracking branch 'origin/master' into stdenv-updates 2013-01-17 14:19:14 +01:00
Eelco Dolstra
bb6db816fe mplayer: Disable use of unfree binary codecs by default 2013-01-14 23:08:27 +01:00
Eelco Dolstra
f59881fc30 mplayer: Change directory name / attribute name from MPlayer to mplayer 2013-01-14 14:38:24 +01:00
Vladimír Čunát
479b58d706 Update vlc (minor bugfix). 2013-01-14 12:21:22 +01:00
Jan Malakhovski
4b041ea0b7 xbmc: add version 11 2013-01-05 23:33:50 +01:00
Lluís Batlle i Rossell
b58780c43d Merge remote-tracking branch 'eelco/master' into stdenv-updates
Conflicts:
	pkgs/development/compilers/gcc/4.7/default.nix

Trivial solution.
2012-12-28 23:28:16 +01:00
Eelco Dolstra
ab3eeabfed Rename buildNativeInputs -> nativeBuildInputs
Likewise for propagatedBuildNativeInputs, etc.  "buildNativeInputs"
sounds like an imperative rather than a noun phrase.
2012-12-28 19:20:09 +01:00
Mathijs Kwik
6776756882 mkvtoolnix: upgrade to 5.9.0 2012-12-13 14:00:28 +01:00
Mathijs Kwik
d4d4528833 new package: GPAC 2012-12-01 12:23:23 +01:00
Mathijs Kwik
4c8d63d549 mkvtoolnix: upgrade to 5.8.0 2012-12-01 12:23:23 +01:00
Eelco Dolstra
5553546c21 Remove a bunch of unreferenced files
Plus a small number of obsolete packages (like old versions of qemu).
2012-11-29 13:43:37 +01:00
Cillian de Róiste
27f3a41754 Add key-mon
a utility to show live keyboard and mouse status for teaching and screencasts
2012-11-11 18:13:04 +01:00