Fine-grained dependencies in solver output
In this commit we modify the _output_ of the modular solver (CP, the modular's solver internal version of ConfiguredPackage) to have fine-grained dependency. This doesn't yet modify the rest of cabal-install, so once we translate from CP to ConfiguredPackage we still lose the distinctions between different kinds of dependencies; this will be the topic of the next commit. In the modular solver (and elsewhere) we use Data.Graph to represent the dependency graph (and the reverse dependency graph). However, now that we have more fine-grained dependencies, we really want an _edge-labeled_ graph, which unfortunately it not available in the `containers` package. Therefore I've written a very simple wrapper around Data.Graph that supports edge labels; we don't need many fancy graph algorithms, and can still use Data.Graph on these edged graphs when we want (by calling them on the underlying unlabeled graph), so adding a dependency on `fgl` does not seem worth it.
Showing
- cabal-install/Distribution/Client/Dependency/Modular/Assignment.hs 15 additions, 10 deletions...tall/Distribution/Client/Dependency/Modular/Assignment.hs
- cabal-install/Distribution/Client/Dependency/Modular/Builder.hs 7 additions, 6 deletions...install/Distribution/Client/Dependency/Modular/Builder.hs
- cabal-install/Distribution/Client/Dependency/Modular/Configured.hs 2 additions, 1 deletion...tall/Distribution/Client/Dependency/Modular/Configured.hs
- cabal-install/Distribution/Client/Dependency/Modular/ConfiguredConversion.hs 3 additions, 1 deletion...ibution/Client/Dependency/Modular/ConfiguredConversion.hs
- cabal-install/Distribution/Client/Dependency/Modular/Dependency.hs 1 addition, 1 deletion...tall/Distribution/Client/Dependency/Modular/Dependency.hs
- cabal-install/Distribution/Client/Dependency/Modular/IndexConversion.hs 8 additions, 3 deletions...Distribution/Client/Dependency/Modular/IndexConversion.hs
- cabal-install/Distribution/Client/Dependency/Modular/Package.hs 2 additions, 0 deletions...install/Distribution/Client/Dependency/Modular/Package.hs
- cabal-install/Distribution/Client/Utils/LabeledGraph.hs 114 additions, 0 deletionscabal-install/Distribution/Client/Utils/LabeledGraph.hs
- cabal-install/cabal-install.cabal 1 addition, 0 deletionscabal-install/cabal-install.cabal
Loading
Please register or sign in to comment