Skip to content
Commit 2c62a36b authored by Eelco Dolstra's avatar Eelco Dolstra
Browse files

Merge remote-tracking branch 'origin/staging' into modular-stdenv 

Conflicts:
	pkgs/stdenv/generic/default.nix
parents a8fc68a5 77359554
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