Merge branch 'master' of github.com:NixOS/nixpkgs

This commit is contained in:
Shea Levy 2017-03-01 11:11:50 -05:00
commit dbd7a73d0b

View File

@ -874,4 +874,10 @@ self: super: {
# fixed in unreleased (2017-03-01) https://github.com/ekmett/machines/commit/5463cf5a69194faaec2345dff36469b4b7a8aef0
machines = doJailbreak super.machines;
# fixed in unreleased (2017-03-01) https://github.com/choener/OrderedBits/commit/7b9c6c6c61d9acd0be8b38939915d287df3c53ab
OrderedBits = doJailbreak super.OrderedBits;
# https://github.com/haskell-distributed/rank1dynamic/issues/17
rank1dynamic = doJailbreak super.rank1dynamic;
}