From cf989ad5240c2d08e002ac99b08f85cc8ee6ebf7 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Sat, 15 Sep 2018 15:29:53 +0200 Subject: Bump bar --- custom/bar/generated.nix | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/custom/bar/generated.nix b/custom/bar/generated.nix index eec35630..e1947632 100644 --- a/custom/bar/generated.nix +++ b/custom/bar/generated.nix @@ -1,35 +1,35 @@ -{ mkDerivation, aeson, base, bytestring, case-insensitive -, classy-prelude, classy-prelude-conduit, classy-prelude-yesod -, conduit, containers, data-default, directory, fast-logger -, fetchgit, file-embed, hashids, hjsmin, http-conduit, lens -, monad-control, monad-logger, mtl, persistent -, persistent-postgresql, persistent-template, safe, shakespeare -, stdenv, systemd, template-haskell, text, thermoprint-client, time -, unordered-containers, vector, wai, wai-extra, wai-logger, warp -, yaml, yesod, yesod-auth, yesod-core, yesod-form, yesod-static +{ mkDerivation, aeson, base, bytestring, classy-prelude +, classy-prelude-yesod, conduit, containers, fast-logger, fetchgit +, file-embed, foreign-store, hashids, hpack, http-conduit, lens +, monad-logger, mtl, persistent, persistent-postgresql +, persistent-template, shakespeare, stdenv, systemd +, template-haskell, text, time, unordered-containers, vector, wai +, wai-extra, wai-logger, warp, yaml, yesod, yesod-core, yesod-form +, yesod-static, thermoprint-client ? null }: mkDerivation { pname = "bar"; version = "0.6.6"; src = fetchgit { url = "git://git.yggdrasil.li/gkleen/pub/bar"; - sha256 = "0ib80kxd1wc8l8w3nl1xd6v9jsnpb83hpd5c9j5l61b8h0m9lv2n"; - rev = "42cd5f4a218be39b90a37d94eb5cdb6570ad2ab2"; + sha256 = "18f9k5lzv872h5mgjnbsq7a6v793k54h0bxgvc625qm42w4fh98g"; + rev = "2cb80224e382e046e59d65137cd5403974a5759a"; }; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base bytestring case-insensitive classy-prelude - classy-prelude-conduit classy-prelude-yesod conduit containers - data-default directory fast-logger file-embed hashids hjsmin - http-conduit lens monad-control monad-logger mtl persistent - persistent-postgresql persistent-template safe shakespeare systemd - template-haskell text thermoprint-client time unordered-containers - vector wai wai-extra wai-logger warp yaml yesod yesod-auth - yesod-core yesod-form yesod-static - ]; - executableHaskellDepends = [ base ]; + aeson base bytestring classy-prelude classy-prelude-yesod conduit + containers fast-logger file-embed hashids http-conduit lens + monad-logger mtl persistent persistent-postgresql + persistent-template shakespeare systemd template-haskell text time + unordered-containers vector wai wai-extra wai-logger warp yaml + yesod yesod-core yesod-form yesod-static + ] ++ (if thermoprint-client != null then [thermoprint-client] else []); + configureFlags = if thermoprint-client != null then [ "thermoprint" ] else []; + libraryToolDepends = [ hpack ]; + executableHaskellDepends = [ base foreign-store warp ]; doHaddock = false; + preConfigure = "hpack"; license = stdenv.lib.licenses.unfree; hydraPlatforms = stdenv.lib.platforms.none; } -- cgit v1.2.3