Merge pull request #120 from hercules-ci/improvements

Improvements

effects/effect/effect.nix

@@ -8,7 +8,14 @@ let
     jq
   ];
 
-  mkDrv = args: stdenvNoCC.mkDerivation (args // {
+  mkDrv = args:
+    let
+      mkDerivation =
+        lib.throwIf (args?imports) "`mkEffect` does not support `imports`. Did you mean `modularEffect` instead of `mkEffect`?"
+        stdenvNoCC.mkDerivation;
+
+    in mkDerivation (args // {
+
 
     phases = args.phases or "initPhase unpackPhase patchPhase ${args.preGetStatePhases or ""} getStatePhase userSetupPhase ${args.preEffectPhases or ""} effectPhase putStatePhase ${args.postEffectPhases or ""}";
 

effects/modules/git-auth-gh.nix

@@ -8,6 +8,10 @@ let
   cfg = config.programs.gh;
 in
 {
+  imports = [
+    ./git-auth.nix
+  ];
+
   options = {
     programs.gh.enable = lib.mkOption {
       description = ''

flake-modules/github-pages.nix

@@ -125,6 +125,14 @@ in
           # deploy
           {
             ${cfg.pushJob}.outputs.effects.gh-pages =
+              lib.throwIf (cfg.branch == "gh-pages") ''
+                The option `hercules-ci.github-pages.branch` refers to the branch
+                that serves as a source for the GitHub Pages deployment. You've set
+                it to "gh-pages" which is the output. You'll probably want to
+                specify a branch like your default branch, such as "main", "develop"
+                or "master", or some other branch that isn't occupied by the build
+                output.
+              ''
               lib.optionalAttrs
                 (herculesCI.config.repo.branch == cfg.branch)
                 deploy;