Fixed many runtime errors

digitallyinduced · Aug 5, 2023 · d4a77c6 · d4a77c6
1 parent de4d557
commit d4a77c6
Show file tree

Hide file tree

Showing 12 changed files with 411 additions and 43 deletions.
diff --git a/NixSupport/mkGhcCompiler.nix b/NixSupport/mkGhcCompiler.nix
@@ -6,6 +6,7 @@
 , dontHaddockPackages ? []
 , manualOverrides ? _: _: { }
 , haskellPackagesDir ? ./haskell-packages
+, filter
 , ... }:
 
 let
@@ -20,7 +21,7 @@ let
       };
       makePackageSet = dir: pkgs.lib.mapAttrs' (toPackage dir) (builtins.readDir dir);
     in {
-      "ihp" = ((haskellPackagesNew.callPackage "${toString ihp}/ihp.nix") { });
+      "ihp" = ((haskellPackagesNew.callPackage "${toString ihp}/ihp.nix") { inherit filter; });
     } // (makePackageSet haskellPackagesDir) // (makePackageSet "${ihp}/NixSupport/haskell-packages/.");
 
   makeOverrides =

diff --git a/NixSupport/nixosModules/app.nix b/NixSupport/nixosModules/app.nix
@@ -1,5 +1,5 @@
 # Running an IHP web server + Worker
-{ config, pkgs, modulesPath, lib, ihp, ihpApp, ... }:
+{ config, pkgs, modulesPath, lib, ihp, ... }:
 let cfg = config.services.ihp;
 in
 {

diff --git a/NixSupport/nixosModules/appWithPostgres.nix b/NixSupport/nixosModules/appWithPostgres.nix
@@ -1,5 +1,5 @@
 # Running IHP app + a local Postgres connected to it
-{ config, pkgs, modulesPath, lib, ihp, ihpApp, ... }:
+{ config, pkgs, modulesPath, lib, ihp, ... }:
 let cfg = config.services.ihp;
 in
 {
@@ -80,5 +80,7 @@ in
             \i ${cfg.fixtures}
         '';
     };
+
+    services.ihp.databaseUrl = ""; # TODO: Set this to some real value
 }
 
diff --git a/NixSupport/nixosModules/options.nix b/NixSupport/nixosModules/options.nix
@@ -1,12 +1,18 @@
 # Running IHP app + a local Postgres connected to it
-{ config, pkgs, modulesPath, lib, ihpApp, ... }:
+{ config, pkgs, modulesPath, lib, ... }:
+with lib;
 {
     options.services.ihp = {
         enable = mkEnableOption "IHP";
         domain = mkOption {
             type = types.str;
             default = "localhost";
         };
+
+        baseUrl = mkOption {
+            type = types.str;
+            default = "https://${config.services.ihp.domain}";
+        };
 
         migrations = mkOption {
             type = types.path;
@@ -21,7 +27,7 @@
         };
 
         httpsEnabled = mkOption {
-            type = types.boolean;
+            type = types.bool;
             default = true;
         };
 
@@ -35,6 +41,10 @@
             default = "ihp";
         };
 
+        databaseUrl = mkOption {
+            type = types.str;
+        };
+
         # https://ihp.digitallyinduced.com/Guide/database-migrations.html#skipping-old-migrations
         minimumRevision = mkOption {
             type = types.int;
@@ -60,7 +70,7 @@
             type = types.str;
         };
 
-        addionalEnvVars = mkOption {
+        additionalEnvVars = mkOption {
             type = types.attrs;
             default = {};
         };

diff --git a/NixSupport/nixosModules/services/app.nix b/NixSupport/nixosModules/services/app.nix
@@ -1,5 +1,6 @@
-{ config, pkgs, modulesPath, lib, ihpApp, migrate, migrations, ... }:
-let cfg = config.services.ihp;
+{ config, pkgs, modulesPath, lib, ihpApp, ... }:
+let
+    cfg = config.services.ihp;
 in
 {
     systemd.services.app = {
@@ -16,7 +17,7 @@ in
         environment =
             let
                 defaultEnv = {
-                    PORT = cfg.appPort;
+                    PORT = "${toString cfg.appPort}";
                     IHP_ENV = cfg.ihpEnv;
                     IHP_BASEURL = cfg.baseUrl;
                     IHP_REQUEST_LOGGER_IP_ADDR_SOURCE = cfg.requestLoggerIPAddrSource;

diff --git a/NixSupport/nixosModules/services/migrate.nix b/NixSupport/nixosModules/services/migrate.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ config, pkgs, ihp, ... }:
 let cfg = config.services.ihp;
 in
 {
@@ -12,16 +12,16 @@ in
                 '';
             };
         in {
-        serviceConfig = {
-            Type = "oneshot";
-        };
-        script = ''
-            cd ${migrateApp}
-            ${self.packages.x86_64-linux.migrate}/bin/migrate
-        '';
-        environment = {
-            DATABASE_URL = cfg.databaseUrl;
-            MINIMUM_REVISION = "${cfg.minimumRevision}";
-        };
+            serviceConfig = {
+                Type = "oneshot";
+            };
+            script = ''
+                cd ${migrateApp}
+                ${ihp.apps.x86_64-linux.migrate.program}
+            '';
+            environment = {
+                DATABASE_URL = cfg.databaseUrl;
+                MINIMUM_REVISION = "${toString cfg.minimumRevision}";
+            };
     };
 }
diff --git a/NixSupport/nixosModules/services/worker.nix b/NixSupport/nixosModules/services/worker.nix
@@ -1,5 +1,6 @@
-{ config, pkgs, modulesPath, lib, ihpApp, migrate, migrations, ... }:
-let cfg = config.services.ihp;
+{ config, pkgs, ihpApp, lib, ... }:
+let
+    cfg = config.services.ihp;
 in
 {
     systemd.services.worker = {
@@ -15,7 +16,7 @@ in
         environment =
             let
                 defaultEnv = {
-                    PORT = cfg.port;
+                    PORT = "${toString cfg.appPort}";
                     IHP_ENV = cfg.ihpEnv;
                     IHP_BASEURL = cfg.baseUrl;
                     IHP_REQUEST_LOGGER_IP_ADDR_SOURCE = cfg.requestLoggerIPAddrSource;

diff --git a/devenv-module.nix b/devenv-module.nix
@@ -3,22 +3,28 @@ flake-parts module for setting the local IHP devenv shell
 this is different from the devenv environment used by IHP apps!
 that is defined in flake-module.nix
 */
-
+{ inputs }:
 {
-    perSystem = { pkgs, lib, ... }: {
+    perSystem = { nix-filter, pkgs, lib, ... }: let
+        ghcCompiler = import ./NixSupport/mkGhcCompiler.nix {
+            inherit pkgs;
+            ghcCompiler = pkgs.haskell.packages.ghc944;
+            ihp = ./.;
+            filter = inputs.nix-filter.lib;
+        };
+    in {
+
+        apps.migrate = {
+            type = "app";
+            program = "${ghcCompiler.ihp}/bin/migrate";
+        };
+
         devenv.shells.default = {
             packages = with pkgs; [ entr nodejs-18_x ];
             containers = lib.mkForce {};  # https://github.com/cachix/devenv/issues/528
 
             languages.haskell.enable = true;
             languages.haskell.package =
-                let
-                    ghcCompiler = import ./NixSupport/mkGhcCompiler.nix {
-                        inherit pkgs;
-                        ghcCompiler = pkgs.haskell.packages.ghc944;
-                        ihp = ./.;
-                    };
-                in
                     ghcCompiler.ghc.withPackages (p: with p; [
                         # Copied from ihp.nix
                         base

diff --git a/flake-module.nix b/flake-module.nix
@@ -95,6 +95,7 @@ ihpFlake:
                 inherit (cfg) ghcCompiler dontCheckPackages doJailbreakPackages dontHaddockPackages;
                 ihp = ihp;
                 haskellPackagesDir = cfg.projectPath + "/Config/nix/haskell-packages";
+                filter = ihpFlake.inputs.nix-filter.lib;
             };
         in lib.mkIf cfg.enable {
             # release build package
@@ -125,11 +126,6 @@ ihpFlake:
                     pkgs = pkgs;
                 };
 
-
-                migrate = pkgs.writeScriptBin "migrate" ''
-                    ${ghcCompiler.ihp}/bin/migrate
-                '';
-
                 ihp-schema = pkgs.stdenv.mkDerivation {
                     name = "ihp-schema";
                     src = ihp;