Shea Levy 1927e59308 Merge branch 'texlive-bump' of git://github.com/jacobhinkle/nixpkgs ... Bump texlive download versions *0215->*0314		2014-03-28 21:36:25 -04:00
..
applications	Add zotero 4.0.19 (close #2043)	2014-03-27 22:42:47 +01:00
build-support	Merge pull request #2010 from ambrop72/fetchgit-no-submodules	2014-03-26 11:11:25 +01:00
data	man-pages-posix: update 2003a -> 2013-a	2014-03-16 17:39:50 +01:00
desktops	Add shotwell 1.15.1	2014-03-18 18:23:13 +01:00
development	haskell-DAV: jailbreak to fix build with recent versions of xml-conduit	2014-03-27 23:23:22 +01:00
games	springLobby: update from 0.182 to 0.186	2014-03-27 03:02:07 +02:00
misc
os-specific	nvidia-x11: Update to 331.49	2014-03-28 16:43:56 +01:00
servers	mysql upgrade to 5.5.37	2014-03-28 11:12:20 +08:00
shells
stdenv	Explicitly require Nix 1.6	2014-03-17 11:33:36 +01:00
test
tools	Bump texlive download versions *0215->*0314	2014-03-28 15:56:56 -06:00
top-level	deepmerge: Add nodejs package	2014-03-28 15:17:17 +01:00