diff --git a/pkgs/development/libraries/haskell/comonad-transformers/2.1.2.nix b/pkgs/development/libraries/haskell/comonad-transformers/2.1.2.nix new file mode 100644 index 00000000000..1dd7c212c71 --- /dev/null +++ b/pkgs/development/libraries/haskell/comonad-transformers/2.1.2.nix @@ -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; + }; +}) diff --git a/pkgs/development/libraries/haskell/comonad-transformers/default.nix b/pkgs/development/libraries/haskell/comonad-transformers/3.0.nix similarity index 100% rename from pkgs/development/libraries/haskell/comonad-transformers/default.nix rename to pkgs/development/libraries/haskell/comonad-transformers/3.0.nix diff --git a/pkgs/development/libraries/haskell/comonad/1.1.1.6.nix b/pkgs/development/libraries/haskell/comonad/1.1.1.6.nix new file mode 100644 index 00000000000..53e014fb8ac --- /dev/null +++ b/pkgs/development/libraries/haskell/comonad/1.1.1.6.nix @@ -0,0 +1,14 @@ +{ cabal, semigroups, transformers }: + +cabal.mkDerivation (self: { + pname = "comonad"; + version = "1.1.1.6"; + sha256 = "1sg0pa7393mzfm27pl52nchplhkls3k0f4ff8vzk76wzrgvhysg5"; + buildDepends = [ semigroups transformers ]; + meta = { + homepage = "http://github.com/ekmett/comonad/"; + description = "Haskell 98 compatible comonads"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/comonad/default.nix b/pkgs/development/libraries/haskell/comonad/3.0.0.1.nix similarity index 100% rename from pkgs/development/libraries/haskell/comonad/default.nix rename to pkgs/development/libraries/haskell/comonad/3.0.0.1.nix diff --git a/pkgs/development/libraries/haskell/semigroupoids/1.3.4.nix b/pkgs/development/libraries/haskell/semigroupoids/1.3.4.nix new file mode 100644 index 00000000000..776e452eafe --- /dev/null +++ b/pkgs/development/libraries/haskell/semigroupoids/1.3.4.nix @@ -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; + }; +}) diff --git a/pkgs/development/libraries/haskell/semigroupoids/default.nix b/pkgs/development/libraries/haskell/semigroupoids/3.0.nix similarity index 100% rename from pkgs/development/libraries/haskell/semigroupoids/default.nix rename to pkgs/development/libraries/haskell/semigroupoids/3.0.nix diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 16c0ba59cb4..c53f9f46b1b 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -532,9 +532,20 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); colour = callPackage ../development/libraries/haskell/colour {}; - comonad = callPackage ../development/libraries/haskell/comonad {}; + comonad_1_1_1_6 = callPackage ../development/libraries/haskell/comonad/1.1.1.6.nix {}; - comonadTransformers = callPackage ../development/libraries/haskell/comonad-transformers {}; + comonad_3_0_0_1 = callPackage ../development/libraries/haskell/comonad/3.0.0.1.nix {}; + + comonad = self.comonad_3_0_0_1; + + comonadTransformers_2_1_2 = callPackage ../development/libraries/haskell/comonad-transformers/2.1.2.nix { + comonad = self.comonad_1_1_1_6; + semigroupoids = self.semigroupoids_1_3_4; + }; + + comonadTransformers_3_0 = callPackage ../development/libraries/haskell/comonad-transformers/3.0.nix {}; + + comonadTransformers = self.comonadTransformers_3_0; compactStringFix = callPackage ../development/libraries/haskell/compact-string-fix {}; @@ -596,7 +607,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); dataInttrie = callPackage ../development/libraries/haskell/data-inttrie {}; - dataLens = callPackage ../development/libraries/haskell/data-lens {}; + dataLens = callPackage ../development/libraries/haskell/data-lens { + comonadTransformers = self.comonadTransformers_2_1_2; + semigroupoids = self.semigroupoids_1_3_4; + }; dataLensTemplate = callPackage ../development/libraries/haskell/data-lens-template {}; @@ -1311,7 +1325,13 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); semigroups = callPackage ../development/libraries/haskell/semigroups {}; - semigroupoids = callPackage ../development/libraries/haskell/semigroupoids {}; + semigroupoids_1_3_4 = callPackage ../development/libraries/haskell/semigroupoids/1.3.4.nix { + comonad = self.comonad_1_1_1_6; + }; + + semigroupoids_3_0 = callPackage ../development/libraries/haskell/semigroupoids/3.0.nix {}; + + semigroupoids = self.semigroupoids_3_0; shelly = callPackage ../development/libraries/haskell/shelly {};