Skip to content
Commit b077940b authored by Yury G. Kudryashov's avatar Yury G. Kudryashov
Browse files

svn merge https://nixos.org/repos/nix/nixpkgs/trunk 

No conflicts

svn path=/nixpkgs/branches/stdenv-updates/; revision=30916
parents 14bbbbbe 9e839d01
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