Merge branch 'master' into enable-cabal2nix

This commit is contained in:
Joe Kachmar 2018-11-11 01:12:29 -05:00 committed by GitHub
commit cfeba66c85
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -927,7 +927,7 @@ packages:
"Michal J. Gajda <maintainer@migamake.com> @mgajda":
- iterable
- FenwickTree
- json-autotype < 0 # via lens-4.17
- json-autotype
"Dom De Re <domdere@domdere.com> @domdere":
- cassava-conduit
@ -3669,7 +3669,7 @@ packages:
"Nikos Karagianndis <nkarag@gmail.com> @nkarag":
- DBFunctor
"Marat Khafizov <xafizoff@gmail.com> @xafizoff":
- n2o
#- n2o-nitro
@ -3797,7 +3797,6 @@ packages:
- bson < 0
- bson-lens < 0
- bugsnag-haskell < 0
- cabal-install < 0
- cachix < 0
- cachix-api < 0
- cairo < 0