Merge remote-tracking branch 'NixOS/master' into staging

Browse Source

...

This commit is contained in:

Matthew Bauer

2019-02-18 20:36:48 -05:00

parent a808baa5e5 266315c91d

commit b1bbd94bb6

183 changed files with 10841 additions and 3646 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/development/haskell-modules/hackage-packages.nix

Generated

+3550 -1250

File diff suppressed because it is too large Load Diff