Skip to content
Commit 4914e63a authored by Peter Simons's avatar Peter Simons
Browse files

Merge changes from branch 'master' into stdenv-updates. 

Conflicts:
	pkgs/development/libraries/icu/default.nix
	pkgs/tools/misc/coreutils/default.nix
parents d7be1e84 b6c7c4a1
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment