Alexander Foremny
|
d987fedd43
|
Merge remote-tracking branch 'upstream/master' into haskell-snap
Conflicts:
pkgs/development/libraries/haskell/comonad-transformers/default.nix
pkgs/development/libraries/haskell/semigroupoids/default.nix
pkgs/top-level/haskell-packages.nix
|
2012-07-26 12:27:59 +02:00 |
|