Fix monolithic inplace build tool PATH #5633

fgaz · 2018-10-21T19:30:28Z

Monolithic inplace packages have a directory for each exe, so we allow
multiple paths and return all the exe paths of the package.

Fixes #5104

/cc @hvr

cabal-install/Distribution/Client/ProjectPlanning.hs

"url":"pull/5633", "account":"haskell", "repo":"cabal", "commit": "497db229ca68243e7c8e9c03831d529a99d38882", "tag":"linux-7.10.3" }

"url":"pull/5633", "account":"haskell", "repo":"cabal", "commit": "497db229ca68243e7c8e9c03831d529a99d38882", "tag":"linux-7.8.4" }

"url":"pull/5633", "account":"haskell", "repo":"cabal", "commit": "497db229ca68243e7c8e9c03831d529a99d38882", "tag":"linux-8.0.2" }

"url":"pull/5633", "account":"haskell", "repo":"cabal", "commit": "497db229ca68243e7c8e9c03831d529a99d38882", "tag":"linux-7.6.3" }

"url":"pull/5633", "account":"haskell", "repo":"cabal", "commit": "497db229ca68243e7c8e9c03831d529a99d38882", "tag":"linux-8.2.2" }

"url":"pull/5633", "account":"haskell", "repo":"cabal", "commit": "d5781dc7b857a3d802821d6be958134f086dff60", "tag":"linux-7.10.3" }

"url":"pull/5633", "account":"haskell", "repo":"cabal", "commit": "d5781dc7b857a3d802821d6be958134f086dff60", "tag":"linux-8.0.2" }

"url":"pull/5633", "account":"haskell", "repo":"cabal", "commit": "d5781dc7b857a3d802821d6be958134f086dff60", "tag":"linux-7.8.4" }

"url":"pull/5633", "account":"haskell", "repo":"cabal", "commit": "d5781dc7b857a3d802821d6be958134f086dff60", "tag":"linux-7.6.3" }

"url":"pull/5633", "account":"haskell", "repo":"cabal", "commit": "d5781dc7b857a3d802821d6be958134f086dff60", "tag":"linux-8.2.2" }

"url":"pull/5633", "account":"haskell", "repo":"cabal", "commit": "d5781dc7b857a3d802821d6be958134f086dff60", "tag":"linux-8.4.4" }

"url":"pull/5633", "account":"haskell", "repo":"cabal", "commit": "d5781dc7b857a3d802821d6be958134f086dff60", "tag":"linux-8.4.4-fdebug-expensive-assertions" }

"url":"pull/5633", "account":"haskell", "repo":"cabal", "commit": "d5781dc7b857a3d802821d6be958134f086dff60", "tag":"osx-7.8.4" }

"url":"pull/5633", "account":"haskell", "repo":"cabal", "commit": "d5781dc7b857a3d802821d6be958134f086dff60", "tag":"osx-7.10.3" }

hvr · 2018-10-21T22:03:58Z

I can confirm this fixes the original repro-case from #5104; I'm currently dogfooding this PR locally

"url":"pull/5633", "account":"haskell", "repo":"cabal", "commit": "d5781dc7b857a3d802821d6be958134f086dff60", "tag":"osx-8.0.2" }

hvr · 2018-10-23T20:32:08Z

@23Skidoo fwiw, I couldn't find any empirical problems yet; I'd suggest merging

23Skidoo

LGTM modulo minor stylistic issues.

23Skidoo · 2018-10-23T23:37:48Z

cabal-install/Distribution/Client/ProjectPlanning.hs

-                , Just path <- [planPackageExePath pkg] ]
-            exe_map1 = Map.union external_exe_map exe_map
+                , let paths = planPackageExePaths pkg ]
+            exe_map1 = Map.union external_exe_map (pure <$> exe_map)


I'd rather be a bit more explicit here and write this as M.map singleton exe_map (if there's no singleton :: a -> [a] in cabal-install, we can add it to Distribution.Compat.Prelude or a utils module. Or just use (\a -> [a]).

What about singleton <$> exe_map or fmap singleton exe_map? It's clear that it's a map from the Map.union imo

23Skidoo · 2018-10-23T23:40:02Z

cabal-install/Distribution/Client/ProjectPlanning.hs

            binDirectoryFor
                distDirLayout
                elaboratedSharedConfig
-                elab $
+                elab <$>


I'd use map instead of <$> here as well.

Like map (binDirectoryFor ...) case ...? or inline map? The first is a bit hard to follow imo, and inline map is just <$> (it's clear that we are acting on a [] from the type sig)... maybe a comment instead?

Or what about a binding?

Suggested change

elab <$>

elab

<$> executables

where

executables =

I was thinking of `map` instead of <$>.

23Skidoo · 2018-10-24T13:36:54Z

@fgaz Both suggestions sound fine, use your discretion.

Monolithic inplace packages have a directory for each exe, so we allow multiple paths and return all the exe paths of the package. Fixes haskell#5104

fgaz · 2018-10-29T10:19:31Z

Cherry picked on 2.4

"url":"pull/5633", "account":"haskell", "repo":"cabal", "commit": "c81bc98faecd922da640455f99c10008ff3fb191", "tag":"linux-7.10.3" }

"url":"pull/5633", "account":"haskell", "repo":"cabal", "commit": "c81bc98faecd922da640455f99c10008ff3fb191", "tag":"linux-8.0.2" }

"url":"pull/5633", "account":"haskell", "repo":"cabal", "commit": "c81bc98faecd922da640455f99c10008ff3fb191", "tag":"linux-7.8.4" }

"url":"pull/5633", "account":"haskell", "repo":"cabal", "commit": "c81bc98faecd922da640455f99c10008ff3fb191", "tag":"linux-7.6.3" }

fgaz added the cabal-install: nix-local-build label Oct 21, 2018

fgaz added this to the 2.4.0.1 milestone Oct 21, 2018

fgaz commented Oct 21, 2018

View reviewed changes

cabal-install/Distribution/Client/ProjectPlanning.hs Outdated Show resolved Hide resolved

fgaz force-pushed the in-place-build-tools branch from 497db22 to d5781dc Compare October 21, 2018 19:46

haskell-pushbot pushed a commit to haskell-pushbot/cabal-binaries that referenced this pull request Oct 21, 2018

{"origin":"haskell/cabal/pull/5633",

435cf53

"url":"pull/5633", "account":"haskell", "repo":"cabal", "commit": "497db229ca68243e7c8e9c03831d529a99d38882", "tag":"linux-7.10.3" }

haskell-pushbot pushed a commit to haskell-pushbot/cabal-binaries that referenced this pull request Oct 21, 2018

{"origin":"haskell/cabal/pull/5633",

8c1d0e2

"url":"pull/5633", "account":"haskell", "repo":"cabal", "commit": "497db229ca68243e7c8e9c03831d529a99d38882", "tag":"linux-7.8.4" }

haskell-pushbot pushed a commit to haskell-pushbot/cabal-binaries that referenced this pull request Oct 21, 2018

{"origin":"haskell/cabal/pull/5633",

bde3758

"url":"pull/5633", "account":"haskell", "repo":"cabal", "commit": "497db229ca68243e7c8e9c03831d529a99d38882", "tag":"linux-8.0.2" }

haskell-pushbot pushed a commit to haskell-pushbot/cabal-binaries that referenced this pull request Oct 21, 2018

{"origin":"haskell/cabal/pull/5633",

263e864

"url":"pull/5633", "account":"haskell", "repo":"cabal", "commit": "497db229ca68243e7c8e9c03831d529a99d38882", "tag":"linux-7.6.3" }

haskell-pushbot pushed a commit to haskell-pushbot/cabal-binaries that referenced this pull request Oct 21, 2018

{"origin":"haskell/cabal/pull/5633",

4e185fd

"url":"pull/5633", "account":"haskell", "repo":"cabal", "commit": "497db229ca68243e7c8e9c03831d529a99d38882", "tag":"linux-8.2.2" }

haskell-pushbot pushed a commit to haskell-pushbot/cabal-binaries that referenced this pull request Oct 21, 2018

{"origin":"haskell/cabal/pull/5633",

e8b8b5c

"url":"pull/5633", "account":"haskell", "repo":"cabal", "commit": "d5781dc7b857a3d802821d6be958134f086dff60", "tag":"linux-7.10.3" }

haskell-pushbot pushed a commit to haskell-pushbot/cabal-binaries that referenced this pull request Oct 21, 2018

{"origin":"haskell/cabal/pull/5633",

69011b4

"url":"pull/5633", "account":"haskell", "repo":"cabal", "commit": "d5781dc7b857a3d802821d6be958134f086dff60", "tag":"linux-8.0.2" }

haskell-pushbot pushed a commit to haskell-pushbot/cabal-binaries that referenced this pull request Oct 21, 2018

{"origin":"haskell/cabal/pull/5633",

ea15130

"url":"pull/5633", "account":"haskell", "repo":"cabal", "commit": "d5781dc7b857a3d802821d6be958134f086dff60", "tag":"linux-7.8.4" }

haskell-pushbot pushed a commit to haskell-pushbot/cabal-binaries that referenced this pull request Oct 21, 2018

{"origin":"haskell/cabal/pull/5633",

fd8cc4c

"url":"pull/5633", "account":"haskell", "repo":"cabal", "commit": "d5781dc7b857a3d802821d6be958134f086dff60", "tag":"linux-7.6.3" }

haskell-pushbot pushed a commit to haskell-pushbot/cabal-binaries that referenced this pull request Oct 21, 2018

{"origin":"haskell/cabal/pull/5633",

6d0584c

"url":"pull/5633", "account":"haskell", "repo":"cabal", "commit": "d5781dc7b857a3d802821d6be958134f086dff60", "tag":"linux-8.2.2" }

haskell-pushbot pushed a commit to haskell-pushbot/cabal-binaries that referenced this pull request Oct 21, 2018

{"origin":"haskell/cabal/pull/5633",

4600847

"url":"pull/5633", "account":"haskell", "repo":"cabal", "commit": "d5781dc7b857a3d802821d6be958134f086dff60", "tag":"linux-8.4.4" }

haskell-pushbot pushed a commit to haskell-pushbot/cabal-binaries that referenced this pull request Oct 21, 2018

{"origin":"haskell/cabal/pull/5633",

f94a18a

"url":"pull/5633", "account":"haskell", "repo":"cabal", "commit": "d5781dc7b857a3d802821d6be958134f086dff60", "tag":"osx-7.8.4" }

haskell-pushbot pushed a commit to haskell-pushbot/cabal-binaries that referenced this pull request Oct 21, 2018

{"origin":"haskell/cabal/pull/5633",

5e5b2bb

"url":"pull/5633", "account":"haskell", "repo":"cabal", "commit": "d5781dc7b857a3d802821d6be958134f086dff60", "tag":"osx-7.10.3" }

haskell-pushbot pushed a commit to haskell-pushbot/cabal-binaries that referenced this pull request Oct 21, 2018

{"origin":"haskell/cabal/pull/5633",

68ac612

"url":"pull/5633", "account":"haskell", "repo":"cabal", "commit": "d5781dc7b857a3d802821d6be958134f086dff60", "tag":"osx-8.0.2" }

23Skidoo requested changes Oct 23, 2018

View reviewed changes

Fix monolithic inplace build tool PATH

c81bc98

Monolithic inplace packages have a directory for each exe, so we allow multiple paths and return all the exe paths of the package. Fixes haskell#5104

fgaz force-pushed the in-place-build-tools branch from d5781dc to c81bc98 Compare October 29, 2018 10:10

fgaz merged commit 82b4fec into haskell:master Oct 29, 2018

haskell-pushbot pushed a commit to haskell-pushbot/cabal-binaries that referenced this pull request Oct 29, 2018

{"origin":"haskell/cabal/pull/5633",

71b2ec6

"url":"pull/5633", "account":"haskell", "repo":"cabal", "commit": "c81bc98faecd922da640455f99c10008ff3fb191", "tag":"linux-7.10.3" }

haskell-pushbot pushed a commit to haskell-pushbot/cabal-binaries that referenced this pull request Oct 29, 2018

{"origin":"haskell/cabal/pull/5633",

1ecc205

"url":"pull/5633", "account":"haskell", "repo":"cabal", "commit": "c81bc98faecd922da640455f99c10008ff3fb191", "tag":"linux-8.0.2" }

haskell-pushbot pushed a commit to haskell-pushbot/cabal-binaries that referenced this pull request Oct 29, 2018

{"origin":"haskell/cabal/pull/5633",

6da4734

"url":"pull/5633", "account":"haskell", "repo":"cabal", "commit": "c81bc98faecd922da640455f99c10008ff3fb191", "tag":"linux-7.8.4" }

haskell-pushbot pushed a commit to haskell-pushbot/cabal-binaries that referenced this pull request Oct 29, 2018

{"origin":"haskell/cabal/pull/5633",

ff8f2db

"url":"pull/5633", "account":"haskell", "repo":"cabal", "commit": "c81bc98faecd922da640455f99c10008ff3fb191", "tag":"linux-7.6.3" }

fgaz deleted the in-place-build-tools branch August 29, 2021 14:52

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Fix monolithic inplace build tool PATH #5633

Fix monolithic inplace build tool PATH #5633

Uh oh!

fgaz commented Oct 21, 2018

Uh oh!

Uh oh!

hvr commented Oct 21, 2018

Uh oh!

hvr commented Oct 23, 2018

Uh oh!

23Skidoo left a comment

Uh oh!

23Skidoo Oct 23, 2018

Uh oh!

fgaz Oct 24, 2018

Uh oh!

23Skidoo Oct 23, 2018

Uh oh!

fgaz Oct 24, 2018

Uh oh!

23Skidoo Oct 24, 2018

Uh oh!

23Skidoo commented Oct 24, 2018

Uh oh!

fgaz commented Oct 29, 2018

Uh oh!

Uh oh!

-                elab <$>
+                elab
+                <$> executables
+        where
+            executables =

Fix monolithic inplace build tool PATH #5633

Fix monolithic inplace build tool PATH #5633

Uh oh!

Conversation

fgaz commented Oct 21, 2018

Uh oh!

Uh oh!

hvr commented Oct 21, 2018

Uh oh!

hvr commented Oct 23, 2018

Uh oh!

23Skidoo left a comment

Choose a reason for hiding this comment

Uh oh!

23Skidoo Oct 23, 2018

Choose a reason for hiding this comment

Uh oh!

fgaz Oct 24, 2018

Choose a reason for hiding this comment

Uh oh!

23Skidoo Oct 23, 2018

Choose a reason for hiding this comment

Uh oh!

fgaz Oct 24, 2018

Choose a reason for hiding this comment

Uh oh!

23Skidoo Oct 24, 2018

Choose a reason for hiding this comment

Uh oh!

23Skidoo commented Oct 24, 2018

Uh oh!

fgaz commented Oct 29, 2018

Uh oh!

Uh oh!