Merge branch 'master' into closure-size

Browse Source

Beware that stdenv doesn't build. It seems something more will be needed
than just resolution of merge conflicts.

...

This commit is contained in:

Vladimír Čunát

2016-04-01 10:06:01 +02:00

parent c643ccaa8c a26357eefe

commit ab15a62c68

1108 changed files with 76254 additions and 11297 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

pkgs/tools/virtualization/azure-cli/node-packages.nix

+400 -528

File diff suppressed because it is too large Load Diff