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

This reverts commit 411f7ed0b215e79147154ace985ba27bcd17d428.

Conflicts:
	pkgs/development/compilers/llvm/3.4/clang.nix
	pkgs/development/interpreters/nix-exec/default.nix
	pkgs/development/libraries/haskell/js-jquery/default.nix
	pkgs/tools/package-management/nix/unstable.nix
	pkgs/top-level/all-packages.nix
Revert "Merge branch 'master' of https://github.com/NixOS/nixpkgs"

This reverts commit 0b648e2a17ba6489fbcdfea0dd74e7f2b9ff91c0.

Conflicts:
	pkgs/tools/security/gnupg/21.nix