Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

hslib: Function to extract the haskell build inputs of a package. #33012

Merged
merged 1 commit into from Dec 28, 2017

Conversation

shlevy
Copy link
Member

@shlevy shlevy commented Dec 23, 2017

This works by extracting out some logic from generic-builder.nix to
make it possible to get at the relevant information by overriding
mkDerivation for the haskell package.

This works by extracting out some logic from generic-builder.nix to
make it possible to get at the relevant information by overriding
mkDerivation for the haskell package.
Copy link
Member

@Ericson2314 Ericson2314 left a comment

Choose a reason for hiding this comment

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

Just incude the native ones too and it's good with me.

allPkgconfigDepends = pkgconfigDepends ++ libraryPkgconfigDepends ++ executablePkgconfigDepends ++
optionals doCheck testPkgconfigDepends ++ optionals doBenchmark benchmarkPkgconfigDepends;
inherit (haskellLib.extractBuildInputs ghc (args // { inherit doCheck doBenchmark; }))
allPkgconfigDepends propagatedBuildInputs otherBuildInputs haskellBuildInputs systemBuildInputs;

nativeBuildInputs = optional (allPkgconfigDepends != []) pkgconfig ++
Copy link
Member

Choose a reason for hiding this comment

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

Don't forget these too!

Copy link
Member Author

Choose a reason for hiding this comment

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

Nothing has changed with these, they're not available in pkg.env either...

Copy link
Member

Choose a reason for hiding this comment

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

@shlevy What do you mean nothing has changed?

As to them not being in pkg.env, that's an error I have some disorganized commits I intend to add to #26799 after #26805 finally lands. I started making a buildInputs vs nativeBuildInputs distinction in #26480 and should have fixed pkg.env then.

Copy link
Member Author

Choose a reason for hiding this comment

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

I just mean that the definition of nativeBuildInputs hasn't changed nor has its usage. Nothing in this PR required extracting it out. There's no reason not to do so in the future if there's a need, but there's also no reason to do so now...

Copy link
Member

Choose a reason for hiding this comment

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

That's fine then.

@shlevy shlevy closed this Dec 28, 2017
@shlevy shlevy deleted the hslib-haskell-build-inputs branch December 28, 2017 16:25
@shlevy shlevy merged commit d545ef3 into NixOS:master Dec 28, 2017
@peti
Copy link
Member

peti commented Dec 28, 2017

Reverted in 65138e8. Please give a chance to review before merging changes to the Haskell generic builder.

@shlevy
Copy link
Member Author

shlevy commented Dec 29, 2017

@peti this was open for 5 days and had a positive review from another significant contributor with no comments from you. Was there any problem with this?

@shlevy
Copy link
Member Author

shlevy commented Dec 29, 2017

Note that this doesn't change behavior at all.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants