nixpkgs/pkgs/applications
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
..
audio Merge remote-tracking branch 'origin/master' into stdenv-updates 2013-03-07 19:33:52 +01:00
display-managers/slim consolekit: Remove 2012-12-13 11:30:18 +01:00
editors Re-generate all Haskell packages with the latest version of cabal2nix. 2013-02-25 00:32:40 +01:00
graphics Merge remote-tracking branch 'origin/master' into stdenv-updates 2013-03-07 19:33:52 +01:00
misc xmobar: patch to support <freeratio> variable in memory monitor 2013-03-08 13:37:58 +01:00
networking Merge remote-tracking branch 'origin/master' into stdenv-updates 2013-03-07 19:33:52 +01:00
office koffice, kbluetooth: remove from hydra 2013-03-02 09:21:11 +01:00
science qucs: minor update and fix for new gcc 2013-02-24 15:11:19 +01:00
taxes
version-management Merge remote-tracking branch 'origin/master' into stdenv-updates 2013-03-07 19:33:52 +01:00
video Merge branch 'makemkv.130223.0' of git://github.com/jcumming/nixpkgs 2013-03-08 17:26:53 -05:00
virtualization Merge branch 'master' into stdenv-updates 2013-03-02 10:41:53 +01:00
window-managers Merge branch 'master' into stdenv-updates 2013-03-02 10:41:53 +01:00