Merge branch 'master' of https://github.com/NixOS/nixpkgs

Conflicts:
	pkgs/applications/editors/sublime3/default.nix
	pkgs/applications/networking/mailreaders/notmuch/default.nix
	pkgs/build-support/cabal/default.nix
	pkgs/build-support/clang-wrapper/builder.sh
	pkgs/build-support/clang-wrapper/clang-wrapper.sh
	pkgs/build-support/clang-wrapper/default.nix
	pkgs/build-support/clang-wrapper/setup-hook.sh
	pkgs/build-support/gcc-wrapper/default.nix
	pkgs/development/compilers/gcc/3.3/builder.sh
	pkgs/development/compilers/ghc/7.8.3-binary.nix
	pkgs/development/compilers/julia/0.3.0.nix
	pkgs/development/compilers/julia/git-20131013.nix
	pkgs/development/interpreters/perl/5.16/default.nix
	pkgs/development/libraries/boost/generic.nix
	pkgs/development/libraries/db/osx.patch
	pkgs/development/libraries/haskell/conduit-combinators/default.nix
	pkgs/development/libraries/haskell/conduit/default.nix
	pkgs/development/libraries/libc++/default.nix
	pkgs/development/libraries/libc++abi/default.nix
	pkgs/development/libraries/libedit/default.nix
	pkgs/development/libraries/mpfr/default.nix
	pkgs/development/libraries/serf/default.nix
	pkgs/development/libraries/tokyo-cabinet/default.nix
	pkgs/games/spring/default.nix
	pkgs/stdenv/adapters.nix
	pkgs/stdenv/darwin/default.nix
	pkgs/stdenv/generic/builder.sh
	pkgs/stdenv/generic/default.nix
	pkgs/stdenv/generic/setup.sh
	pkgs/stdenv/linux/default.nix
	pkgs/tools/archivers/sharutils/default.nix
	pkgs/tools/networking/snx/default.nix
	pkgs/tools/networking/strongswan/default.nix
	pkgs/tools/security/gnupg/20.nix
	pkgs/tools/security/tor/torbrowser.nix
	pkgs/tools/typesetting/tex/tex4ht/default.nix
	pkgs/top-level/all-packages.nix
	pkgs/top-level/haskell-packages.nix
Merge branch 'master' of https://github.com/NixOS/nixpkgs
stop using progname