William A. Kennington III 6602f49495 Revert "Revert "Merge pull request #9543 from NixOS/staging.post-15.06"" ...

This reverts commit 741bf840da.

This reverts the fallout from reverting the major changes.

2015-11-14 12:32:51 -08:00

..

default.nix

Revert "Revert "Merge pull request #9543 from NixOS/staging.post-15.06""

2015-11-14 12:32:51 -08:00