From 932574a52938c933540ce2ba572dd1a73cb45c97 Mon Sep 17 00:00:00 2001 From: Alexander Foremny Date: Thu, 26 Jul 2012 12:17:26 +0200 Subject: [PATCH] Add package haskell-snap and dependencies comonad-1.1.1.6 comonad-3.0.0.1 configurator-0.2.0.0 contravariant-0.2.0.2 data-lens-2.10.1 data-lens-template-2.1.5 distributive-0.2.2 heist-0.8.1.1 semigroupoids-1.3.4 snap-0.9.1.1 xmlhtml-0.2.0.0 --- .../haskell/comonad-transformers/default.nix | 19 +++++++++++++ .../libraries/haskell/comonad/1.1.1.6.nix | 14 ++++++++++ .../libraries/haskell/comonad/default.nix | 14 ++++++++++ .../haskell/configurator/default.nix | 18 ++++++++++++ .../haskell/contravariant/default.nix | 14 ++++++++++ .../haskell/data-lens-template/default.nix | 14 ++++++++++ .../libraries/haskell/data-lens/default.nix | 17 +++++++++++ .../haskell/distributive/default.nix | 14 ++++++++++ .../libraries/haskell/heist/default.nix | 21 ++++++++++++++ .../haskell/semigroupoids/default.nix | 14 ++++++++++ .../libraries/haskell/snap/snap.nix | 28 +++++++++++++++++++ .../libraries/haskell/xmlhtml/default.nix | 17 +++++++++++ pkgs/top-level/haskell-packages.nix | 26 +++++++++++++++++ 13 files changed, 230 insertions(+) create mode 100644 pkgs/development/libraries/haskell/comonad-transformers/default.nix create mode 100644 pkgs/development/libraries/haskell/comonad/1.1.1.6.nix create mode 100644 pkgs/development/libraries/haskell/comonad/default.nix create mode 100644 pkgs/development/libraries/haskell/configurator/default.nix create mode 100644 pkgs/development/libraries/haskell/contravariant/default.nix create mode 100644 pkgs/development/libraries/haskell/data-lens-template/default.nix create mode 100644 pkgs/development/libraries/haskell/data-lens/default.nix create mode 100644 pkgs/development/libraries/haskell/distributive/default.nix create mode 100644 pkgs/development/libraries/haskell/heist/default.nix create mode 100644 pkgs/development/libraries/haskell/semigroupoids/default.nix create mode 100644 pkgs/development/libraries/haskell/snap/snap.nix create mode 100644 pkgs/development/libraries/haskell/xmlhtml/default.nix diff --git a/pkgs/development/libraries/haskell/comonad-transformers/default.nix b/pkgs/development/libraries/haskell/comonad-transformers/default.nix new file mode 100644 index 00000000000..1dd7c212c71 --- /dev/null +++ b/pkgs/development/libraries/haskell/comonad-transformers/default.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/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/default.nix new file mode 100644 index 00000000000..b73e29fc1e0 --- /dev/null +++ b/pkgs/development/libraries/haskell/comonad/default.nix @@ -0,0 +1,14 @@ +{ cabal, semigroups, transformers }: + +cabal.mkDerivation (self: { + pname = "comonad"; + version = "3.0.0.1"; + sha256 = "03xslpfil96v1qgk2g29vi46mb7l0fafy446ng1p4xgq9ddb2yaz"; + 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/configurator/default.nix b/pkgs/development/libraries/haskell/configurator/default.nix new file mode 100644 index 00000000000..0c4c610106e --- /dev/null +++ b/pkgs/development/libraries/haskell/configurator/default.nix @@ -0,0 +1,18 @@ +{ cabal, attoparsec, hashable, text, unixCompat +, unorderedContainers +}: + +cabal.mkDerivation (self: { + pname = "configurator"; + version = "0.2.0.0"; + sha256 = "0zkcmziyfq2sm9i75ysi5nxd21fynp88m0safhmn3jld7plj03la"; + buildDepends = [ + attoparsec hashable text unixCompat unorderedContainers + ]; + meta = { + homepage = "http://github.com/bos/configurator"; + description = "Configuration management"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/contravariant/default.nix b/pkgs/development/libraries/haskell/contravariant/default.nix new file mode 100644 index 00000000000..526b9e1f997 --- /dev/null +++ b/pkgs/development/libraries/haskell/contravariant/default.nix @@ -0,0 +1,14 @@ +{ cabal, transformers }: + +cabal.mkDerivation (self: { + pname = "contravariant"; + version = "0.2.0.2"; + sha256 = "0142s1c914zbfnvysvcc9s3bv8qs6wimnqcmxca1gxaxqvyfkf3p"; + buildDepends = [ transformers ]; + meta = { + homepage = "http://github.com/ekmett/contravariant/"; + description = "Haskell 98 contravariant functors"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/data-lens-template/default.nix b/pkgs/development/libraries/haskell/data-lens-template/default.nix new file mode 100644 index 00000000000..fc058b92e54 --- /dev/null +++ b/pkgs/development/libraries/haskell/data-lens-template/default.nix @@ -0,0 +1,14 @@ +{ cabal, dataLens }: + +cabal.mkDerivation (self: { + pname = "data-lens-template"; + version = "2.1.5"; + sha256 = "09i9lby5jd2kcg0l7y4hkga7jxixcpqw4dc7h1kngqdz92a1ydxc"; + buildDepends = [ dataLens ]; + meta = { + homepage = "http://github.com/ekmett/data-lens-template/"; + description = "Utilities for Data.Lens"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/data-lens/default.nix b/pkgs/development/libraries/haskell/data-lens/default.nix new file mode 100644 index 00000000000..48d49324bb5 --- /dev/null +++ b/pkgs/development/libraries/haskell/data-lens/default.nix @@ -0,0 +1,17 @@ +{ cabal, comonad, comonadTransformers, semigroupoids, transformers +}: + +cabal.mkDerivation (self: { + pname = "data-lens"; + version = "2.10.1"; + sha256 = "01n5lsq8nbn2lqsyz6y3md47zwpmdpfvhhlwn4fdpcl2d4hdh6xh"; + buildDepends = [ + comonad comonadTransformers semigroupoids transformers + ]; + meta = { + homepage = "http://github.com/roconnor/data-lens/"; + description = "Haskell 98 Lenses"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/distributive/default.nix b/pkgs/development/libraries/haskell/distributive/default.nix new file mode 100644 index 00000000000..a8b07c608d8 --- /dev/null +++ b/pkgs/development/libraries/haskell/distributive/default.nix @@ -0,0 +1,14 @@ +{ cabal, transformers }: + +cabal.mkDerivation (self: { + pname = "distributive"; + version = "0.2.2"; + sha256 = "13wvr2wb3h2nr1qd3dwjqx0b6g4igjqm3q2cyi4mc41gwihkbhr2"; + buildDepends = [ transformers ]; + meta = { + homepage = "http://github.com/ekmett/distributive/"; + description = "Haskell 98 Distributive functors -- Dual to Traversable"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/heist/default.nix b/pkgs/development/libraries/haskell/heist/default.nix new file mode 100644 index 00000000000..44ba8ba15ee --- /dev/null +++ b/pkgs/development/libraries/haskell/heist/default.nix @@ -0,0 +1,21 @@ +{ cabal, aeson, attoparsec, blazeBuilder, blazeHtml, directoryTree +, filepath, MonadCatchIOTransformers, mtl, random, text, time +, transformers, unorderedContainers, vector, xmlhtml +}: + +cabal.mkDerivation (self: { + pname = "heist"; + version = "0.8.1.1"; + sha256 = "0ad56izskafpc1dx2nq0a8w71ayppwx8dc7kdaw1by972kh3nflh"; + buildDepends = [ + aeson attoparsec blazeBuilder blazeHtml directoryTree filepath + MonadCatchIOTransformers mtl random text time transformers + unorderedContainers vector xmlhtml + ]; + meta = { + homepage = "http://snapframework.com/"; + description = "An (x)html templating system"; + 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/default.nix new file mode 100644 index 00000000000..776e452eafe --- /dev/null +++ b/pkgs/development/libraries/haskell/semigroupoids/default.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/snap/snap.nix b/pkgs/development/libraries/haskell/snap/snap.nix new file mode 100644 index 00000000000..505c9bcb0cc --- /dev/null +++ b/pkgs/development/libraries/haskell/snap/snap.nix @@ -0,0 +1,28 @@ +{ cabal, aeson, attoparsec, cereal, clientsession, configurator +, dataLens, dataLensTemplate, directoryTree, filepath, hashable +, heist, logict, MonadCatchIOTransformers, mtl, mwcRandom +, pwstoreFast, snapCore, snapServer, stm, syb, text, time +, transformers, unorderedContainers, utf8String, vector +, vectorAlgorithms, xmlhtml +}: + +cabal.mkDerivation (self: { + pname = "snap"; + version = "0.9.1.1"; + sha256 = "1g8jvnwrhna5g064dmv4v4khrpwwn0vcqw8l7rcpkp75l46fq29z"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + aeson attoparsec cereal clientsession configurator dataLens + dataLensTemplate directoryTree filepath hashable heist logict + MonadCatchIOTransformers mtl mwcRandom pwstoreFast snapCore + snapServer stm syb text time transformers unorderedContainers + utf8String vector vectorAlgorithms xmlhtml + ]; + meta = { + homepage = "http://snapframework.com/"; + description = "Snap: A Haskell Web Framework: project starter executable and glue code library"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/xmlhtml/default.nix b/pkgs/development/libraries/haskell/xmlhtml/default.nix new file mode 100644 index 00000000000..654da2e76b5 --- /dev/null +++ b/pkgs/development/libraries/haskell/xmlhtml/default.nix @@ -0,0 +1,17 @@ +{ cabal, blazeBuilder, blazeHtml, blazeMarkup, parsec, text +, unorderedContainers +}: + +cabal.mkDerivation (self: { + pname = "xmlhtml"; + version = "0.2.0.2"; + sha256 = "0dqlqx3cnrqap3ficdkmwm8661j8i7qknb8xhjqvfmnb9pwqdks2"; + buildDepends = [ + blazeBuilder blazeHtml blazeMarkup parsec text unorderedContainers + ]; + meta = { + description = "XML parser and renderer with HTML 5 quirks mode"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index a295b8fd654..f808b0feb7f 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -532,12 +532,22 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); colour = callPackage ../development/libraries/haskell/colour {}; + comonad_1_1_1_6 = callPackage ../development/libraries/haskell/comonad/1.1.1.6.nix {}; + + comonad = callPackage ../development/libraries/haskell/comonad/default.nix {}; + + comonadTransformers = callPackage ../development/libraries/haskell/comonad-transformers {}; + compactStringFix = callPackage ../development/libraries/haskell/compact-string-fix {}; conduit = callPackage ../development/libraries/haskell/conduit {}; ConfigFile = callPackage ../development/libraries/haskell/ConfigFile {}; + configurator = callPackage ../development/libraries/haskell/configurator {}; + + contravariant = callPackage ../development/libraries/haskell/contravariant {}; + convertible = callPackage ../development/libraries/haskell/convertible { time = self.time_1_1_3; }; @@ -588,6 +598,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 {}; + + dataLensTemplate = callPackage ../development/libraries/haskell/data-lens-template {}; + dataMemocombinators = callPackage ../development/libraries/haskell/data-memocombinators {}; dataReify = callPackage ../development/libraries/haskell/data-reify {}; @@ -616,6 +630,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); directoryTree = callPackage ../development/libraries/haskell/directory-tree {}; + distributive = callPackage ../development/libraries/haskell/distributive {}; + dlist = callPackage ../development/libraries/haskell/dlist {}; dotgen = callPackage ../development/libraries/haskell/dotgen {}; @@ -841,6 +857,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); HDBCSqlite = callPackage ../development/libraries/haskell/HDBC/HDBC-sqlite3.nix {}; + heist = callPackage ../development/libraries/haskell/heist {}; + HFuse = callPackage ../development/libraries/haskell/hfuse {}; HGL = callPackage ../development/libraries/haskell/HGL {}; @@ -1289,6 +1307,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); sendfile = callPackage ../development/libraries/haskell/sendfile {}; + semigroupoids = callPackage ../development/libraries/haskell/semigroupoids { + comonad = self.comonad_1_1_1_6; + }; + semigroups = callPackage ../development/libraries/haskell/semigroups {}; shelly = callPackage ../development/libraries/haskell/shelly {}; @@ -1299,6 +1321,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); smallcheck = callPackage ../development/libraries/haskell/smallcheck {}; + snap = callPackage ../development/libraries/haskell/snap/snap.nix {}; + snapCore = callPackage ../development/libraries/haskell/snap/core.nix {}; snapServer = callPackage ../development/libraries/haskell/snap/server.nix {}; @@ -1571,6 +1595,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); xmlConduit = callPackage ../development/libraries/haskell/xml-conduit {}; + xmlhtml = callPackage ../development/libraries/haskell/xmlhtml {}; + xmlTypes = callPackage ../development/libraries/haskell/xml-types {}; xssSanitize = callPackage ../development/libraries/haskell/xss-sanitize {};