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
This commit is contained in:
@@ -0,0 +1,19 @@
|
||||
{ cabal, comonad, contravariant, distributive, semigroupoids
|
||||
, semigroups, transformers
|
||||
}:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "comonad-transformers";
|
||||
version = "2.1.2";
|
||||
sha256 = "0yhpsifnqxrg1p8f9hjslwkrakiaxa2kk9726q923a5sj225cvis";
|
||||
buildDepends = [
|
||||
comonad contravariant distributive semigroupoids semigroups
|
||||
transformers
|
||||
];
|
||||
meta = {
|
||||
homepage = "http://github.com/ekmett/comonad-transformers/";
|
||||
description = "Comonad transformers";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
};
|
||||
})
|
||||
@@ -4,8 +4,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "comonad-transformers";
|
||||
version = "2.1.2";
|
||||
sha256 = "0yhpsifnqxrg1p8f9hjslwkrakiaxa2kk9726q923a5sj225cvis";
|
||||
version = "3.0";
|
||||
sha256 = "1bjix61rdzmqcd1irh6p91jwy4sz1617sj4zic07p7ng9h7fsz24";
|
||||
buildDepends = [
|
||||
comonad contravariant distributive semigroupoids semigroups
|
||||
transformers
|
||||
|
||||
Reference in New Issue
Block a user