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.

Sign up for GitHub

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

Jump to bottom

haskell package set configuration clean-up #33588

Closed
wants to merge 1 commit into from
Closed

haskell package set configuration clean-up #33588

wants to merge 1 commit into from
+29 −143

Conversation

mpickering
Copy link
Contributor

Motivation for this change

I went through all the overrides in the configuration-common.nix and configuration-ghc-8.2.nix files and checked whether they were still necessary.

I tested each attribute with nix-shell -p "haskellPackages.<pkg>" to check it still built correctly with ghc822.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

Sorry, something went wrong.

@mpickering mpickering requested a review from peti as a code owner January 7, 2018 23:38
peti
peti reviewed Jan 8, 2018
View reviewed changes
Copy link
Member

@peti peti left a comment

Choose a reason for hiding this comment

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

Wow, very cool! Thank you very much for the effort you've put into this clean-up. 😃

I have one question about the change to hspec-core. Once we've figured that out; I'll merge the change to the haskell-updates branch for testing on Hydra.

pkgs/development/haskell-modules/configuration-common.nix Outdated
@@ -49,7 +49,10 @@ self: super: {
Dust-crypto = dontCheck super.Dust-crypto;
hasql-postgres = dontCheck super.hasql-postgres;
hspec = super.hspec.override { stringbuilder = dontCheck self.stringbuilder; };
hspec-core = super.hspec-core.override { silently = dontCheck super.silently; temporary = dontCheck super.temporary; };
hspec-core = dontCheck (super.hspec-core.override { silently = dontCheck self.silently; });
Copy link
Member

Choose a reason for hiding this comment

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

This change doesn't look right. The original version did run the hspec-core test suite and it needed special untested variants of some dependencies to accomplish that without creating an infinite loop during evaluation. The new code does not run test suite, however, and therefore it won't need the untested version of silently. I would suggest to either (a) enable tests of hspec-core (which is what I'd prefer) or (b) to remove the override that passes a special version of silently.

@peti peti self-assigned this Jan 8, 2018
@mpickering
Copy link
Contributor Author

I just reverted the change to hspec-core. The tests fail on HEAD but let's not worry about that for now.

@peti
Copy link
Member

peti commented Jan 8, 2018

One more minor nit: can you please re-base this PR for the current master?

@mpickering mpickering force-pushed the haskell-configuration-cleanup branch from 56aeacf to a0d3480 Compare January 8, 2018 13:51
@mpickering
Copy link
Contributor Author

Rebased now.

@peti
Copy link
Member

peti commented Jan 8, 2018

Building at https://hydra.nixos.org/eval/1424581.

@mpickering
Copy link
Contributor Author

Looks like I didn't break anything if I understand the output correctly?

@peti peti closed this in 5542e3c Jan 9, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@peti peti

Assignees

@peti peti

Labels
10.rebuild-darwin: 501+ 10.rebuild-linux: 501+
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@mpickering @peti @GrahamcOfBorg