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
..
all-packages.nix	Merge branch 'makemkv.130223.0' of git://github.com/jcumming/nixpkgs	2013-03-08 17:26:53 -05:00
guile-2-test.nix
haskell-defaults.nix	haskell-defaults.nix: fix build of cabal2nix on GHC versions older than 6.12.x	2013-02-25 01:25:05 +01:00
haskell-packages.nix	haskell-syb: update to version 0.4.0	2013-03-08 13:43:35 +01:00
make-tarball.nix	Nixpkgs channel: Use XZ compression for nixexprs.tar	2013-01-30 12:52:07 +01:00
mingw.nix
node-packages.nix	upgrading uglify to 2.2.5, optimist to 0.3.5, upgrading source-map to 0.1.7, and adding amdefine	2013-02-26 09:45:43 -05:00
perl-packages.nix	Catalyst::Plugin::Captcha: Add	2013-02-27 14:35:56 +01:00
platforms.nix	Raspberrypi platform: make ext4 in kernel	2013-01-29 20:17:36 +01:00
python-packages.nix	Merge remote-tracking branch 'origin/master' into stdenv-updates	2013-03-07 19:33:52 +01:00
release-cross.nix	Merge remote-tracking branch 'origin/master' into stdenv-updates	2013-02-15 13:36:34 +01:00
release-lib.nix	Merge remote-tracking branch 'upstream/master' into stdenv-updates	2013-01-20 16:53:21 +01:00
release-python.nix	Remove some references to non-existent packages	2013-03-08 16:36:59 -05:00
release-small.nix	Remove some references to non-existent packages	2013-03-08 16:36:59 -05:00
release.nix	Merge branch 'vlada/xfce-notg' of git://github.com/vcunat/nixpkgs	2013-03-08 17:03:22 -05:00