Adjust build.nix conditions for haskell projects to reduce risk of a HaskellProjectType added later missing its build

Author: sd234678

.last-exported-commit

@@ -1 +1 @@
-Last exported commit from parent repo: 297f6b375154e7ab9d5329a7038439b907389ab1
+Last exported commit from parent repo: 74075fe52d4ef4cc3fe2e97bd35e30fde9a84b5c

nix-bootstrap.cabal

@@ -5,7 +5,7 @@ cabal-version: 2.0
 -- see: https://github.com/sol/hpack
 
 name:           nix-bootstrap
-version:        2.4.0.0
+version:        2.4.0.1
 author:         gchquser
 maintainer:     [email protected]
 copyright:      Crown Copyright

package.yaml

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 name: nix-bootstrap
-version: 2.4.0.0
+version: 2.4.0.1
 author: gchquser
 maintainer: [email protected]
 copyright: Crown Copyright

src/Bootstrap/Data/Bootstrappable/BuildNix.hs

@@ -11,9 +11,7 @@ import Bootstrap.Data.Bootstrappable
   )
 import Bootstrap.Data.ProjectName (ProjectName)
 import Bootstrap.Data.ProjectType
-  ( HaskellOptions (HaskellOptions),
-    HaskellProjectType (HaskellProjectTypeBasic, HaskellProjectTypeServer),
-    JavaOptions (JavaOptions),
+  ( JavaOptions (JavaOptions),
     ProjectType
       ( Elm,
         Go,
@@ -25,8 +23,8 @@ import Bootstrap.Data.ProjectType
         Rust
       ),
     SetUpGoBuild (SetUpGoBuild),
-    SetUpHaskellBuild (SetUpHaskellBuild),
     SetUpJavaBuild (SetUpJavaBuild),
+    haskellOptionsRequireBuild,
   )
 import Bootstrap.Nix.Expr (Expr (EFunc), FunctionArgs (FASet), IsNixExpr (toNixExpr), nix)
 import Bootstrap.Nix.Expr.ReproducibleBuild
@@ -77,10 +75,9 @@ buildExprFor :: SrcDir -> ProjectName -> ProjectType -> Maybe ReproducibleBuildE
 buildExprFor srcDir projectName = \case
   Minimal -> Nothing
   Elm _ -> Nothing
-  Haskell (HaskellOptions _ (HaskellProjectTypeBasic (SetUpHaskellBuild True))) ->
-    Just . reproducibleHaskellBuild projectName $ srcDirExpr srcDir
-  Haskell (HaskellOptions _ (HaskellProjectTypeServer (SetUpHaskellBuild True))) ->
-    Just . reproducibleHaskellBuild projectName $ srcDirExpr srcDir
+  Haskell haskellOptions
+    | haskellOptionsRequireBuild haskellOptions ->
+        Just . reproducibleHaskellBuild projectName $ srcDirExpr srcDir
   Haskell _ -> Nothing
   Node _ -> Nothing
   Go (SetUpGoBuild True) -> Just $ reproducibleGoBuild projectName

src/Bootstrap/Data/ProjectType.hs

@@ -17,6 +17,7 @@ module Bootstrap.Data.ProjectType
     ElmMode (..),
     HaskellOptions (..),
     HaskellProjectType (..),
+    haskellOptionsRequireBuild,
     promptHaskellProjectType,
     SetUpHaskellBuild (..),
     NodePackageManager (..),
@@ -175,6 +176,13 @@ data HaskellOptions = HaskellOptions
   deriving stock (Eq, Generic, Show)
   deriving (FromDhall, ToDhall) via Codec (Field HaskellOptionsDhallFields) HaskellOptions
 
+-- | Returns true if the user has requested a production build
+haskellOptionsRequireBuild :: HaskellOptions -> Bool
+haskellOptionsRequireBuild HaskellOptions {..} = case haskellOptionsHaskellProjectType of
+  HaskellProjectTypeReplOnly -> False
+  HaskellProjectTypeBasic (SetUpHaskellBuild b) -> b
+  HaskellProjectTypeServer (SetUpHaskellBuild b) -> b
+
 data HaskellProjectTypeV4
   = HaskellProjectV4TypeReplOnly
   | HaskellProjectV4TypeBasic