nixpkgs/pkgs
Peter Simons 76244ac2e2 Merge branch 'master' into stdenv-updates
Conflicts:
	pkgs/development/compilers/ghc/with-packages.nix
2013-08-16 22:51:13 +02:00
..
applications Merge branch 'master' into stdenv-updates 2013-08-16 22:51:13 +02:00
build-support Merge branch 'master' into stdenv-updates 2013-08-16 22:51:13 +02:00
data tango-icon-theme: Add 2013-08-15 18:01:16 +02:00
desktops add thunar-archive-plugin 2013-08-16 13:57:08 +02:00
development Merge branch 'master' into stdenv-updates 2013-08-16 22:51:13 +02:00
games Merge branch 'master' into stdenv-updates 2013-08-16 22:51:13 +02:00
lib typo 2013-08-13 12:22:40 +02:00
misc wine: upgrade to 1.6 + latest gecko/mono extensions 2013-07-30 14:25:10 +02:00
os-specific linux: Update to 3.4.58 2013-08-16 12:05:42 +02:00
servers Merge branch 'master' into stdenv-updates 2013-08-16 22:51:13 +02:00
shells ipython: 0.13.2 -> 1.0.0 2013-08-14 19:16:22 +02:00
stdenv patchPhase: Handle xz compression 2013-08-07 15:46:25 +02:00
test
tools Merge branch 'master' into stdenv-updates 2013-08-16 22:51:13 +02:00
top-level Merge branch 'master' into stdenv-updates 2013-08-16 22:51:13 +02:00