diff --git a/default.nix b/default.nix new file mode 100644 index 0000000..119fd7d --- /dev/null +++ b/default.nix @@ -0,0 +1,38 @@ +{ mkDerivation, 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 +}: +mkDerivation { + pname = "yammat"; + version = "0.0.8"; + src = ./.; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + 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 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 ]; + testHaskellDepends = [ + base classy-prelude classy-prelude-yesod hspec monad-logger + persistent persistent-mysql resourcet transformers yesod yesod-core + yesod-test + ]; + license = stdenv.lib.licenses.agpl3; +} diff --git a/shell.nix b/shell.nix index c8bad93..3d85c16 100644 --- a/shell.nix +++ b/shell.nix @@ -1,34 +1,12 @@ -{ nixpkgs ? import {}, compiler ? "ghc843", doBenchmark ? false -}: +{ nixpkgs ? import {}, compiler ? "default", doBenchmark ? false }: let inherit (nixpkgs) pkgs; - cpyNek0 = - with haskellPackages; callPackage ( - { mkDerivation, aeson, base, classy-prelude, classy-prelude-conduit - , data-default, http-conduit, http-types, persistent, stdenv, yesod - , yesod-newsfeed, yesod-static - }: - mkDerivation { - pname = "classy-prelude-yesod"; - version = "1.4.0"; - sha256 = "0cd2a88f42c3541ba4bce6801c8b8d9c331e1c49a6288bf16f764676a34b9e28"; - libraryHaskellDepends = [ - aeson base classy-prelude classy-prelude-conduit data-default - http-conduit http-types persistent yesod yesod-newsfeed - yesod-static - ]; - doHaddock = false; - homepage = "https://github.com/snoyberg/mono-traversable#readme"; - description = "Provide a classy prelude including common Yesod functionality"; - license = stdenv.lib.licenses.mit; - }) {}; - f = { mkDerivation, aeson, base, base64-bytestring, blaze-builder , blaze-markup, bytestring, classy-prelude, classy-prelude-conduit - , conduit, conduit-extra, containers + , 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 @@ -47,7 +25,7 @@ let isExecutable = true; libraryHaskellDepends = [ aeson base base64-bytestring blaze-builder blaze-markup bytestring - classy-prelude classy-prelude-conduit cpyNek0 conduit + classy-prelude classy-prelude-conduit 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 @@ -58,7 +36,7 @@ let ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ - base classy-prelude cpyNek0 hspec monad-logger + base classy-prelude classy-prelude-yesod hspec monad-logger persistent persistent-mysql resourcet transformers yesod yesod-core yesod-test ]; diff --git a/yammat.cabal b/yammat.cabal index c01c316..d207cb8 100644 --- a/yammat.cabal +++ b/yammat.cabal @@ -67,11 +67,11 @@ library RecordWildCards build-depends: base >= 4 && < 5 - , yesod >= 1.4.1 - , yesod-core >= 1.4.0 - , yesod-auth >= 1.4.0 - , yesod-static >= 1.4.0.3 - , yesod-form >= 1.4.0 + , yesod >= 1.6 + , yesod-core >= 1.6 + , yesod-auth >= 1.6 + , yesod-static >= 1.6 + , yesod-form >= 1.6 , classy-prelude >= 0.10.2 , classy-prelude-conduit >= 0.10.2 , classy-prelude-yesod >= 0.10.2