Merge branch 'master' of github.com:nek0/yammat

pkg.nix

@@ -0,0 +1,46 @@
+{ mkDerivation, dontHaddock, aeson, base, base64-bytestring, blaze-builder
+, blaze-markup, bytestring, classy-prelude, classy-prelude-conduit
+, classy-prelude-yesod, conduit, conduit-extra, containers
+, cryptohash, data-default, directory, fast-logger, file-embed
+, HDBC, HDBC-postgresql, hjsmin, hspec, http-conduit, JuicyPixels
+, JuicyPixels-scale-dct, mime-mail, monad-control, monad-logger
+, persistent, persistent-mysql, persistent-postgresql
+, persistent-template, resourcet, safe, safe-exceptions
+, shakespeare, split, stdenv, template-haskell, text, time
+, transformers, unordered-containers, vector, wai, wai-extra
+, wai-logger, warp, yaml, yesod, yesod-auth, yesod-core, yesod-form
+, yesod-static, yesod-test
+}:
+
+let
+  fixed-classy-prelude = dontHaddock classy-prelude;
+  fixed-classy-prelude-yesod = dontHaddock classy-prelude-yesod;
+in
+
+mkDerivation {
+  pname = "yammat";
+  version = "0.0.8";
+  src = ./.;
+  isLibrary = true;
+  isExecutable = true;
+  doHaddock = false;
+  libraryHaskellDepends = [
+    aeson base base64-bytestring blaze-builder blaze-markup bytestring
+    fixed-classy-prelude classy-prelude-conduit fixed-classy-prelude-yesod conduit
+    conduit-extra containers cryptohash data-default directory
+    fast-logger file-embed HDBC HDBC-postgresql hjsmin http-conduit
+    JuicyPixels JuicyPixels-scale-dct mime-mail monad-control
+    monad-logger persistent persistent-postgresql persistent-template
+    safe safe-exceptions shakespeare split template-haskell text time
+    unordered-containers vector wai wai-extra wai-logger warp yaml
+    yesod yesod-auth yesod-core yesod-form yesod-static
+  ];
+  executableHaskellDepends = [ base ];
+  doCheck = false;
+  testHaskellDepends = [
+    base fixed-classy-prelude fixed-classy-prelude-yesod hspec monad-logger
+    persistent persistent-mysql resourcet transformers yesod yesod-core
+    yesod-test
+  ];
+  license = stdenv.lib.licenses.agpl3;
+}

yammat.cabal

@@ -166,7 +166,7 @@ test-suite test
 
     build-depends: base
                  , yammat
-                 , yesod-test >= 1.4.2 && < 1.5
+                 , yesod-test >= 1.4.2
                  , yesod-core
                  , yesod
                  , persistent