nek0/yammat
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

pkg.nix: rename from default.nix, add sensible default.nix

Browse source
This commit is contained in:
Astro 2020-12-03 17:14:55 +01:00
parent 94b5dc497a
commit d5ec922ab7
2 changed files with 8 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
default.nix
View file

@ -1,40 +1,3 @@
{ mkDerivation, aeson, base, base64-bytestring, blaze-builder { pkgs ? import <nixpkgs> {} }:
, blaze-markup, bytestring, classy-prelude, classy-prelude-conduit
, classy-prelude-yesod, conduit, conduit-extra, containers pkgs.haskellPackages.callPackage ./pkg.nix {}
, 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
];
doCheck = false;
doHaddock = false;
license = stdenv.lib.licenses.agpl3;
}

16
pkg.nix
View file

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