Add compiler-nix-name arg to stackProject

input-output-hk · Oct 27, 2020 · 79e39b1 · 79e39b1
1 parent 2f48630
commit 79e39b1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/docs/tutorials/getting-started.md b/docs/tutorials/getting-started.md
@@ -51,8 +51,8 @@ Add `default.nix`:
     name = "haskell-nix-project";
     src = ./.;
   };
-  # For `cabal.project` based projects specify the GHC version to use.
-  compiler-nix-name = "ghc884"; # Not used for `stack.yaml` based projects.
+  # Specify the GHC version to use.
+  compiler-nix-name = "ghc8102"; # Not required for `stack.yaml` based projects.
 }
 ```
 

diff --git a/overlays/haskell.nix b/overlays/haskell.nix
@@ -567,9 +567,11 @@ final: prev: {
             in let pkg-set = mkStackPkgSet
                 { stack-pkgs = importAndFilterProject callProjectResults;
                   pkg-def-extras = (args.pkg-def-extras or []);
-                  modules =  final.lib.singleton (mkCacheModule cache)
-                             ++ (args.modules or [])
-                             ++ final.lib.optional (args ? ghc) { ghc.package = args.ghc; };
+                  modules = final.lib.singleton (mkCacheModule cache)
+                    ++ (args.modules or [])
+                    ++ final.lib.optional (args ? ghc) { ghc.package = args.ghc; }
+                    ++ final.lib.optional (args ? compiler-nix-name)
+                        { compiler.nix-name = final.lib.mkForce args.compiler-nix-name; };
                 };
 
                 project = addProjectAndPackageAttrs {