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

Unbreak haskellPackages.dhall-nix #96093

Merged
merged 1 commit into from Aug 26, 2020
Merged

Unbreak haskellPackages.dhall-nix #96093

merged 1 commit into from Aug 26, 2020

Conversation

KAction
Copy link
Contributor

@KAction KAction commented Aug 23, 2020

  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • 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 nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@maralorn
Copy link
Member

Halle @KAction thank you for your PR!

Sadly this PR can‘t work this way. The haskell-packages.nix file is autogenerated by the hackage2nix tool from the configuration-hackage2nix.yaml. So your changes would be overriden in the night after a merge.

So to fix this you need to do 2 things.

  1. The overrides of the dependency versions belong in configuration-common.nix. There are plenty of examples there.
  2. To mark a package unbroken please remove it from the broken list in the yaml config mentioned above.

@KAction
Copy link
Contributor Author

KAction commented Aug 25, 2020

Thank you for explanation.

I updated dhall-nix override in configuration-common.nix and removed dhall-nix from list of broken packages, yet it is still marked as broken and nix-build refuses to build it, unless forced. If I force it

$ NIXPKGS_ALLOW_BROKEN=1 nix-build -A dhall-nix

it builds fine. Can you please instruct what else should I do?

cdepillabout
cdepillabout reviewed Aug 25, 2020
View reviewed changes
pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -4415,7 +4415,6 @@ broken-packages:
- dhall-check
- dhall-docs
- dhall-fly
- dhall-nix
Copy link
Member

Choose a reason for hiding this comment

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

Since you've removed this line, the next time the automatic Hackage updater script runs, it will mark dhall-nix as unbroken.

You shouldn't have to do anything on your end, as long as you've checked it does actually compile correctly when enabling building packages marked broken.

cdepillabout
cdepillabout requested changes Aug 26, 2020
View reviewed changes
Copy link
Member

@cdepillabout cdepillabout left a comment

Choose a reason for hiding this comment

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

This looks good, but one last request.

Can you target the haskell-updates branch instead of master? We generally like Haskell-related PRs to go into the haskell-updates branch instead of master.

@KAction KAction changed the base branch from master to haskell-updates August 26, 2020 00:56
@KAction
Copy link
Contributor Author

KAction commented Aug 26, 2020

Ok, done.

@cdepillabout
Copy link
Member

I've confirmed that dhall-nix compiles correctly. Thanks!

@cdepillabout cdepillabout merged commit a6f317a into NixOS:haskell-updates Aug 26, 2020
@KAction KAction deleted the unbreak-haskell-nix branch August 26, 2020 11:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@cdepillabout cdepillabout cdepillabout requested changes

Assignees
No one assigned
Labels
6.topic: haskell 8.has: package (new) 10.rebuild-darwin: 0 10.rebuild-linux: 0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@KAction @maralorn @cdepillabout