The start of the great simplifying (hopefully)

Gonna try mono-morphising the Beam stuff and poly ... uh, morphising
app-level stuff. There's more yet to do.

.gitignore

@@ -1,5 +1,7 @@
 .envrc
+.ghc.environment.*
 database/pgdata
 dist
+dist-newstyle
 logs
 result

.travis/shell.nix

@@ -1,18 +1,6 @@
 let
-  compiler = "default";
-
-  nixpkgs = import ../nix/packages {
-    inherit compiler;
-  };
-
+  nixpkgs = import ../nix/packages;
   tools = import ./tools.nix nixpkgs;
-
-  env = (import ../. {
-    inherit compiler;
-  }).env;
+  package = import ../.;
 in
-  nixpkgs.lib.overrideDerivation env (drv: {
-    nativeBuildInputs =
-      drv.nativeBuildInputs ++
-      tools;
-  })
+  (nixpkgs.haskell.lib.addBuildDepends package tools).env

default.nix

@@ -1,8 +1,4 @@
-{ compiler ? "default"
-}:
 let
-  nixpkgs = import ./nix/packages {
-    inherit compiler;
-  };
+  nixpkgs = import ./nix/packages;
 in
   nixpkgs.haskellPackages.callPackage ./package.nix {}

nix/packages/base-noprelude/default.nix

@@ -0,0 +1,20 @@
+{ lib
+, fetchFromGitHub
+, ...
+}:
+self:
+super:
+let
+  base-noprelude-source = fetchFromGitHub {
+    owner = "haskell-hvr";
+    repo = "base-noprelude";
+    rev = lib.fileContents ./rev;
+    sha256 = lib.fileContents  ./sha;
+  };
+in
+  {
+    base-noprelude = self.callPackage (self.haskellSrc2nix {
+      name = "base-noprelude";
+      src = base-noprelude-source;
+    }) {};
+  }

nix/packages/base-noprelude/rev

@@ -0,0 +1 @@
+e5aabbef8187cbc41a16b2565d93f9d7bc60d68e

nix/packages/base-noprelude/sha

@@ -0,0 +1 @@
+0jj9z2jqcpmdn51mca7807gcym8k4sbd906z0ckr33vblkaa6vd2

nix/packages/beam/rev

@@ -1 +1 @@
-5604d871f6d1e7625e9ff25b7b6fe694d20aaa9f
+2489a213cdee6341de46a3aa015c35067f4d6076

nix/packages/beam/sha

@@ -1 +1 @@
-0av6i8mwx65znj6xii6c8znz4074n14r3v5imxbhypi88kv232hg
+1rv7xz5i0n8wfyzsz612yry2xsgp1hgp9m4pc95nfg5yp1481y97

nix/packages/default.nix

@@ -1,19 +1,16 @@
-{ compiler ? "default"
-}:
-let
-  haskellPackages = compiler: nixpkgs:
-    if compiler == "default"
-      then nixpkgs.haskellPackages
-      else nixpkgs.haskell.packages.${compiler};
-in
-  import ./nixpkgs {
-    config = {
-      packageOverrides = nixpkgs: {
-        haskellPackages = (haskellPackages compiler nixpkgs).override {
-          overrides = self: super:
-            (import ./beam nixpkgs self super) //
-            (import ./validation nixpkgs self super);
+import ./nixpkgs {
+  config = {
+    packageOverrides = nixpkgs: {
+      haskellPackages = nixpkgs.haskellPackages.override {
+        overrides = self: super: {
+          inherit (import ./beam nixpkgs self super)
+            beam-core
+            beam-postgres
+            beam-migrate;
+          inherit (import ./base-noprelude nixpkgs self super)
+            base-noprelude;
         };
       };
     };
-  }
+  };
+}

nix/packages/nixpkgs/rev

@@ -1 +1 @@
-e0d250e5cf6d179e1ccc775472d89718f61fcfd1
+2018654322acefa7e9fcbe45d2541489b0a88fdd

nix/packages/nixpkgs/sha

@@ -1 +1 @@
-1iqpjz4czcpghbv924a5h4jvfmj6c8q6sl3b1z7blz3mi740aivs
+02n49f32cvrbzj938wlndiay6h1k2qbrz12j8gm58qj3vy8ig9c1

nix/tools.nix

@@ -8,5 +8,4 @@ nixpkgs:
     nixpkgs.haskellPackages.ghcid
     nixpkgs.haskellPackages.hindent
     nixpkgs.haskellPackages.hlint
-    nixpkgs.haskellPackages.hpack
   ]

package.nix

@@ -1,12 +1,12 @@
 { mkDerivation, aeson, base-noprelude, beam-core, beam-postgres
-, bytestring, conduit, containers, data-default, hpack, hspec
-, hspec-wai, hspec-wai-json, http-types, insert-ordered-containers
-, jose, lens, monad-control, optparse-applicative
-, postgresql-simple, relude, resource-pool, scrypt, servant
-, servant-auth, servant-auth-server, servant-auth-swagger
-, servant-server, servant-swagger, servant-swagger-ui
-, servant-swagger-ui-core, stdenv, swagger2, text, time
-, transformers, validation, vector, wai, wai-extra, warp
+, bytestring, conduit, containers, data-default, hspec, hspec-wai
+, hspec-wai-json, http-types, insert-ordered-containers, jose, lens
+, monad-control, mtl, optparse-applicative, postgresql-simple
+, relude, resource-pool, scrypt, servant, servant-auth
+, servant-auth-server, servant-auth-swagger, servant-server
+, servant-swagger, servant-swagger-ui, servant-swagger-ui-core
+, stdenv, swagger2, text, time, transformers, validation, vector
+, wai, wai-extra, warp
 }:
 mkDerivation {
   pname = "realworld-conduit";
@@ -17,33 +17,31 @@ mkDerivation {
   libraryHaskellDepends = [
     aeson base-noprelude beam-core beam-postgres bytestring conduit
     containers data-default http-types insert-ordered-containers jose
-    lens monad-control optparse-applicative postgresql-simple relude
-    resource-pool scrypt servant servant-auth servant-auth-server
-    servant-auth-swagger servant-server servant-swagger
-    servant-swagger-ui servant-swagger-ui-core swagger2 text time
-    transformers validation vector wai wai-extra warp
+    lens monad-control mtl optparse-applicative postgresql-simple
+    relude resource-pool scrypt servant servant-auth
+    servant-auth-server servant-auth-swagger servant-server
+    servant-swagger servant-swagger-ui servant-swagger-ui-core swagger2
+    text time transformers validation vector wai wai-extra warp
   ];
-  libraryToolDepends = [ hpack ];
   executableHaskellDepends = [
     aeson base-noprelude beam-core beam-postgres bytestring conduit
     containers data-default http-types insert-ordered-containers jose
-    lens monad-control optparse-applicative postgresql-simple relude
-    resource-pool scrypt servant servant-auth servant-auth-server
-    servant-auth-swagger servant-server servant-swagger
-    servant-swagger-ui servant-swagger-ui-core swagger2 text time
-    transformers validation vector wai wai-extra warp
+    lens monad-control mtl optparse-applicative postgresql-simple
+    relude resource-pool scrypt servant servant-auth
+    servant-auth-server servant-auth-swagger servant-server
+    servant-swagger servant-swagger-ui servant-swagger-ui-core swagger2
+    text time transformers validation vector wai wai-extra warp
   ];
   testHaskellDepends = [
     aeson base-noprelude beam-core beam-postgres bytestring conduit
     containers data-default hspec hspec-wai hspec-wai-json http-types
-    insert-ordered-containers jose lens monad-control
+    insert-ordered-containers jose lens monad-control mtl
     optparse-applicative postgresql-simple relude resource-pool scrypt
     servant servant-auth servant-auth-server servant-auth-swagger
     servant-server servant-swagger servant-swagger-ui
     servant-swagger-ui-core swagger2 text time transformers validation
     vector wai wai-extra warp
   ];
-  preConfigure = "hpack";
   description = "Exemplary fullstack Medium.com clone powered by Servant and Beam";
   license = stdenv.lib.licenses.bsd3;
 }