public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into haskell-snap

Browse Source 
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:
Alexander Foremny
2012-07-26 12:27:59 +02:00
parent 932574a529 da63b3d2e7
commit d987fedd43
53 changed files with 489 additions and 216 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/development/libraries/haskell/semigroupoids/1.3.4.nix Normal file
View File

@@ -0,0 +1,14 @@
{ cabal, comonad, contravariant, semigroups, transformers }:
cabal.mkDerivation (self: {
pname = "semigroupoids";
version = "1.3.4";
sha256 = "0vnipjndbsldk5w1qw35i2zrd418rq13y10g0i33ylg1gwnsrqph";
buildDepends = [ comonad contravariant semigroups transformers ];
meta = {
homepage = "http://github.com/ekmett/semigroupoids";
description = "Haskell 98 semigroupoids: Category sans id";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

4
pkgs/development/libraries/haskell/semigroupoids/default.nix
View File

@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "semigroupoids";
version = "1.3.4";
sha256 = "0vnipjndbsldk5w1qw35i2zrd418rq13y10g0i33ylg1gwnsrqph";
version = "3.0";
sha256 = "0wsax14ck363nby0xrhcpvdzf0pzspayl7gsm0br0lr6ipmpcrag";
buildDepends = [ comonad contravariant semigroups transformers ];
meta = {
homepage = "http://github.com/ekmett/semigroupoids";