Fix stack.yaml generation in example project

haskell · Jun 21, 2020 · 7598b93 · 7598b93
1 parent e2ef03b
commit 7598b93
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/bench/lib/Experiments.hs b/bench/lib/Experiments.hs
@@ -376,10 +376,20 @@ setup = do
             ""
       Stack -> do
         callCommand $ "stack --silent unpack " <> examplePackage <> " --to " <> examplesPath
+        -- Generate the stack descriptor to match the one used to build ghcide
         stack_yaml <- fromMaybe "stack.yaml" <$> getEnv "STACK_YAML"
-        resolver <- find ("resolver" `isPrefixOf`) . lines <$> readFile stack_yaml
+        stack_yaml_lines <- lines <$> readFile stack_yaml
         writeFile (path </> stack_yaml)
-                  (unlines [fromMaybe (error "impossible") resolver, "packages: [.]"])
+                  (unlines $
+                   "packages: [.]" :
+                    [ l
+                    | l <- stack_yaml_lines
+                    , any (`isPrefixOf` l)
+                        ["resolver"
+                        ,"allow-newer"
+                        ,"compiler"]
+                    ]
+                  )
 
         writeFile
             (path </> "hie.yaml")