Merge branch 'primus-upstream'

Conflicts:
	pkgs/applications/version-management/git-and-tools/git/default.nix
	pkgs/tools/X11/primus/default.nix
	pkgs/top-level/haskell-defaults.nix