Shea Levy 50a0b55a01 Merge branch 'oraclejdk' of git://github.com/nilcons/nixpkgs ... Update ffmpeg dependency to 0.10 in oraclejdk7		2014-04-05 15:23:02 -04:00
..
applications	Revert "Merge branch 'k3b' of git://github.com/ttuegel/nixpkgs"	2014-04-05 14:43:00 -04:00
build-support	gcc-wrapper: don't fail when cpp doesn't exist	2014-04-02 19:07:58 +02:00
data	manpages: update from 3.62 to 3.63	2014-04-03 07:59:39 +03:00
desktops	virt-manager: update to 1.0.1, fix & update dependencies, gtk3 support	2014-04-05 18:37:05 +02:00
development	Merge branch 'oraclejdk' of git://github.com/nilcons/nixpkgs	2014-04-05 15:23:02 -04:00
games	Merge master into x-updates	2014-04-01 10:49:31 +02:00
misc	nixpkgs-lint: add the platforms meta attr for most of my packages	2014-03-16 12:08:26 +01:00
os-specific	hostapd: update from 2.0 to 2.1	2014-04-03 07:05:07 +03:00
servers	Merge branch 'rippled' of git://github.com/ehmry/nixpkgs	2014-04-05 14:23:29 -04:00
shells	fish: Fix propagatedBuildInputs and other assorted changes	2014-02-15 12:17:06 +01:00
stdenv	stdenv/setup.sh: make substitute* not drop EOF newline	2014-04-02 19:07:59 +02:00
test
tools	Merge branch 'mtpfs' of git://github.com/qknight/nixpkgs	2014-04-05 15:00:38 -04:00
top-level	Remove superfluous newline	2014-04-05 15:01:05 -04:00