From 1d8e10566e6353407de53bac323be0ead67cdcb3 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Thu, 5 Oct 2017 11:30:49 +0200
Subject: [PATCH] Fix build when using nix & minor cleanup

---
 shell.nix          | 10 ++++------
 src/Application.hs |  2 +-
 stack.yaml         |  1 +
 test/TestImport.hs |  2 +-
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/shell.nix b/shell.nix
index 837e26c67..df2997a61 100644
--- a/shell.nix
+++ b/shell.nix
@@ -13,6 +13,8 @@ let
     CREATE USER uniworx;
     CREATE DATABASE uniworx_test;
     GRANT ALL ON DATABASE uniworx_test TO uniworx;
+    CREATE DATABASE uniworx;
+    GRANT ALL ON DATABASE uniworx TO uniworx;
   '';
 
   postgresHba = pkgs.writeText "hba_file" ''
@@ -33,16 +35,12 @@ let
       export PGHOST=''${pgSockDir} PGLOG=''${pgLogFile}
       psql -f ${postgresSchema} postgres
       printf "Postgres logfile is %s\nPostgres socket directory is %s\n" ''${pgLogFile} ''${pgSockDir}
-      cat > .dbsettings.yml <<EOF
-      database:
-        host: ''${pgSockDir}
-      EOF
 
-      zsh
+      env --unset=shellHook zsh
       ret=$?
 
       pg_ctl stop -D ''${pgDir}
-      rm -rvf .dbsettings.yml ''${pgDir} ''${pgSockDir} ''${pgLogFile}
+      rm -rvf ''${pgDir} ''${pgSockDir} ''${pgLogFile}
       exit ''${ret}
     '';
   };
diff --git a/src/Application.hs b/src/Application.hs
index 3815f9d35..037783ff1 100644
--- a/src/Application.hs
+++ b/src/Application.hs
@@ -133,7 +133,7 @@ getApplicationDev = do
     return (wsettings, app)
 
 getAppDevSettings :: IO AppSettings
-getAppDevSettings = loadYamlSettings ["config/settings.yml", "config/test-settings.yml", configSettingsYml] [configSettingsYmlValue] useEnv
+getAppDevSettings = loadYamlSettings [configSettingsYml] [configSettingsYmlValue] useEnv
 
 -- | main function for use by yesod devel
 develMain :: IO ()
diff --git a/stack.yaml b/stack.yaml
index e845ca645..8a276d119 100644
--- a/stack.yaml
+++ b/stack.yaml
@@ -68,3 +68,4 @@ extra-package-dbs: []
 nix:
   packages: []
   shell-file: ./stack.nix
+  pure: false
diff --git a/test/TestImport.hs b/test/TestImport.hs
index eba79ed72..031453f19 100644
--- a/test/TestImport.hs
+++ b/test/TestImport.hs
@@ -40,7 +40,7 @@ runHandler handler = do
 withApp :: SpecWith (TestApp UniWorX) -> Spec
 withApp = before $ do
     settings <- loadYamlSettings
-        [".dbsettings.yml", "config/test-settings.yml", "config/settings.yml"]
+        ["config/test-settings.yml", "config/settings.yml"]
         []
         useEnv
     foundation <- makeFoundation settings