From d5ec922ab7df99c6c2706a7be58145191b089c7b Mon Sep 17 00:00:00 2001
From: Astro <astro@spaceboyz.net>
Date: Thu, 3 Dec 2020 17:14:55 +0100
Subject: [PATCH] pkg.nix: rename from default.nix, add sensible default.nix

---
 default.nix | 43 +++----------------------------------------
 pkg.nix     | 16 +++++-----------
 2 files changed, 8 insertions(+), 51 deletions(-)

diff --git a/default.nix b/default.nix
index 98a7266..95b0033 100644
--- a/default.nix
+++ b/default.nix
@@ -1,40 +1,3 @@
-{ 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
-  ];
-  doCheck = false;
-  doHaddock = false;
-  license = stdenv.lib.licenses.agpl3;
-}
+{ pkgs ? import <nixpkgs> {} }:
+
+pkgs.haskellPackages.callPackage ./pkg.nix {}
diff --git a/pkg.nix b/pkg.nix
index 76f6b0f..98a7266 100644
--- a/pkg.nix
+++ b/pkg.nix
@@ -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
 , classy-prelude-yesod, conduit, conduit-extra, containers
 , cryptohash, data-default, directory, fast-logger, file-embed
@@ -11,22 +11,15 @@
 , 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
+    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
@@ -36,11 +29,12 @@ mkDerivation {
     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
+    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;
 }