First Pass at a Haskell Package Planner #773
Conversation
| func (p *V2Planner) IsRelevantForPackages(packages []string) bool { | ||
| p.userPackages = packages |
There was a problem hiding this comment.
out of scope for this PR, but this is a strange API, where we save packages as a side-effect in a boolean IsRelevantForPackages function call....
There was a problem hiding this comment.
It's also weird that we do 2 passes of the regex, one to detect if the planner is relevant, and another to actually create the shell plan -- should we be storing the results of the IsRelevantForPackages and then reusing it in GetShellPlan?
Lagoja
force-pushed
the
jl/haskell-package-support
branch
from
452360c to
8799fce
Compare
|
This is now working for both the versioned and default GHC packages. My Go code may be a bit gnarly, so happy to make updates where needed |
| pkgs := p.GetShellPlan(srcDir).DevPackages | ||
| mutualPkgs := lo.Intersect(userPkgs, pkgs) | ||
| // Only apply shell plan if user packages list all the packages from shell plan. | ||
| if len(mutualPkgs) == len(pkgs) { | ||
| // if merge fails, we return no errors for now. | ||
| result, _ = plansdk.MergeShellPlans(result, p.GetShellPlan(srcDir)) |
There was a problem hiding this comment.
I think this is safe given our haskell and php planners. The getRelevantPlanners should filter appropriately.
internal/impl/devbox.go
Outdated
| // If the DevPackages are empty, set them to userDefinedPkgs. | ||
| if len(shellPlan.DevPackages) == 0 { | ||
| shellPlan.DevPackages = userDefinedPkgs | ||
| } |
There was a problem hiding this comment.
@Lagoja I think we want a union of userDefinedPkgs and DevPackages. That way, each shell planner can be focussed purely on its own packages. And we don't drop other user packages.
WDYT?
There was a problem hiding this comment.
I think that might be safer, but it means that planners can't filter the package list after adding them to the definition, which leads to weird stuff like including PHP extensions and haskell compilers twice.
I'll test with union, and if everything works we can go that way for now
There was a problem hiding this comment.
Changed this to:
shellPlan.DevPackages = pkgslice.Unique(append(shellPlan.DevPackages, userDefinedPkgs...))
Summary
This PR addresses #29, using a similar framework as our PHP planner. It makes it possible to use Haskell packages installed via
haskellPackagesalongside GHC.This PR is incomplete - right now it only works for the default
ghcin Nixpkg. We should make sure that we can detect when users request a different compiler version (likehaskell.compiler.ghc810)How was it tested?
Default GHC: Use the following devbox.json:
{ "packages": [ "haskellPackages.aeson", "ghc", "stack" ], "shell": { "init_hook": null }, "nixpkgs": { "commit": "f80ac848e3d6f0c12c52758c0f25c10c97ca3b62" } }Run
devbox shell, then runghc-pkg list | grep aesonto make sure that it installed correctlyVersioned GHC: Use the following devbox.json
{ "packages": [ "haskell.compiler.ghc92", "haskell.packages.ghc92.aeson", "tree", "direnv", "ghc", ], "shell": { "init_hook": null }, "nixpkgs": { "commit": "f80ac848e3d6f0c12c52758c0f25c10c97ca3b62" } }Run
devbox shell, then runghc-pkg list | grep aesonto make sure that it installed correctly. Also confirm that other packages installed as expected