Vladimír Čunát 0a58b512cb Merge master into stdenv-updates ... Conflicts (simple): pkgs/development/compilers/gcc/4.8/default.nix pkgs/development/compilers/llvm/default.nix pkgs/development/libraries/gmp/5.1.1.nix pkgs/development/libraries/gmp/5.1.3.nix pkgs/development/libraries/gmp/5.1.x.nix pkgs/top-level/all-packages.nix		2014-01-18 14:46:20 +01:00
..
applications	Merge master into stdenv-updates	2014-01-18 14:46:20 +01:00
build-support	Merge master into stdenv-updates	2014-01-18 14:46:20 +01:00
data	Whitespace fixes in package expressions I maintain	2014-01-02 17:58:08 +01:00
desktops	Merge master into stdenv-updates	2014-01-18 14:46:20 +01:00
development	Merge master into stdenv-updates	2014-01-18 14:46:20 +01:00
games	Merge master into stdenv-updates	2014-01-18 14:46:20 +01:00
misc	Merge master into stdenv-updates	2014-01-18 14:46:20 +01:00
os-specific	Merge master into stdenv-updates	2014-01-18 14:46:20 +01:00
servers	Merge master into stdenv-updates	2014-01-18 14:46:20 +01:00
shells	Merge master into stdenv-updates	2013-12-29 10:01:22 +01:00
stdenv	fixupPhase: Handle the case where $prefix doesn't exist	2014-01-17 12:41:08 +01:00
test
tools	Merge master into stdenv-updates	2014-01-18 14:46:20 +01:00
top-level	Merge master into stdenv-updates	2014-01-18 14:46:20 +01:00