Skip to content

Pass extra dirs to http transport#4999

Merged
gbaz merged 4 commits intomasterfrom
gb/extra-paths-in-transport
Jan 7, 2018
Merged

Pass extra dirs to http transport#4999
gbaz merged 4 commits intomasterfrom
gb/extra-paths-in-transport

Conversation

@gbaz
Copy link
Collaborator

@gbaz gbaz commented Jan 6, 2018

  • Patches conform to the coding conventions.
  • Any changes that could be relevant to users have been recorded in the changelog.

This should resolve half of #4995 -- as usual, two lines of straightforward changes, and 20x as many lines to make sure the data gets threaded to where it needs to go. In this case I've added an extra prog path field to the GlobalFlags object so it can thread through to be used in looking up binaries for the http transport. It is automatically derived from the setting in the config file.

@gbaz gbaz changed the title Pass extra dirs to transport Pass extra dirs to http transport Jan 6, 2018
@gbaz gbaz requested a review from 23Skidoo January 6, 2018 07:15
@23Skidoo
Copy link
Member

23Skidoo commented Jan 7, 2018

Looks like this breaks some tests.

Copy link
Member

@23Skidoo 23Skidoo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks OK, feel free to merge once you've fixed the test failures. I'll think about how to fix this in a more elegant way.

globalNix :: Flag Bool, -- ^ Integrate with Nix
globalStoreDir :: Flag FilePath
globalStoreDir :: Flag FilePath,
globalProgPathExtra :: NubList FilePath
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please add a -- ^ Haddock comment here.

@gbaz gbaz merged commit ec418e5 into master Jan 7, 2018
@hvr hvr deleted the gb/extra-paths-in-transport branch January 7, 2018 08:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants