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

haskellPackages.hail: add patches to relax cabal dependencies #72923

Merged
merged 1 commit into from Nov 7, 2019

Conversation

astro
Copy link
Contributor

@astro astro commented Nov 6, 2019

Motivation for this change

Didn't build.

Things done
  • 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 nix-review --run "nix-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.
Notify maintainers

cc @ehmry

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.

@astro In order to get this merged, could you do the following things:

  1. For each patch, add a link to the PR it comes from and a short description of why it is needed (what it does).
  2. Ask upstream to make a new release of hail with these patches pulled in. Since these patches appear to only be dependency version fixes, it could just be a Hackage revision instead of a full release. If you added a comment to this PR explaining this, and saying which version of hail you expect to be working without applying these patches, it would be helpful for the nixpkgs maintainers to know when we can remove these patches.
  3. Remove this line: . You can find an explanation of this here: https://discourse.nixos.org/t/video-tutorial-how-to-fix-broken-haskell-packages-in-nix/3968.
  4. Change the base branch for this PR to haskell-updates instead of master. Then actually rebase the commit in this PR onto the haskell-updates branch.

@tfc
Copy link
Contributor

tfc commented Nov 7, 2019

The first patch is already merged to master, and the second patch is a PR that just needs to be merged. how about contacting @shlevy about this to have both patches in and then simply bumping src up to the latest commit on the master branch?

I would profit from this too, as we use hail in our intranet.

@astro
Copy link
Contributor Author

astro commented Nov 7, 2019

@cdepillabout Thank you for your writeup. I hope to have addressed all concerns.

@astro
Copy link
Contributor Author

astro commented Nov 7, 2019

The first patch is already merged to master, and the second patch is a PR that just needs to be merged. how about contacting @shlevy about this to have both patches in and then simply bumping src up to the latest commit on the master branch?

Ok, I have asked in the 2nd PR.

We still would love to have unbroken Hail in 19.09 rather soon than waiting for a single maintainer.

@@ -1292,4 +1292,22 @@ self: super: {
# https://github.com/Happstack/web-routes-th/pull/3
web-routes-th = doJailbreak super.web-routes-th;

# Remove for hail > 0.2.0.0
Copy link
Member

Choose a reason for hiding this comment

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

Comments here look good.

@@ -43,7 +43,7 @@ core-packages:
- ghcjs-base-0

default-package-overrides:
# LTS Haskell 14.12
# LTS Haskell 14.13
Copy link
Member

Choose a reason for hiding this comment

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

You don't actually need to regenerate the default-package-overrides part of this file.

In general, @peti will do this once a week a or so.

@@ -5353,7 +5263,6 @@ broken-packages:
- Haggressive
- hahp
- haiji
- hail
Copy link
Member

Choose a reason for hiding this comment

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

All you need to do is remove this line from the broken-packages section.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Oops, the rest slipped in due to a last test build.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Actually, no. I need to update the PR's target branch.

@@ -11942,21 +11942,22 @@ self: {

"LDAPv3" = callPackage
({ mkDerivation, base, base-encoding, binary, bytestring
, containers, deepseq, int-cast, newtype, quickcheck-instances
Copy link
Member

Choose a reason for hiding this comment

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

This file shouldn't be modified either, since @peti does it once a week or so.

@astro astro changed the base branch from master to haskell-updates November 7, 2019 20:52
@cdepillabout
Copy link
Member

@astro Thanks for updating this.

However, you'll need to do the following things before this can be merged in:

  1. Change the base branch for this PR to haskell-updates instead of master. Then actually rebase the commit in this PR onto the haskell-updates branch.
  2. Make sure not to modify the pkgs/development/haskell-modules/hackage-packages.nix file, since this is done manually once-a-week or so by @peti.
  3. Make sure not to regenerate the default-package-overrides section of the pkgs/development/haskell-modules/configuration-hackage2nix.yaml file, since this is also done by @peti.

We still would love to have unbroken Hail in 19.09 rather soon than waiting for a single maintainer.

As soon as the above are fixed, I think this should be fine to be merged in. Although when a new release of hail is made, we'd be very grateful if you could send another PR removing the patches added in this PR. (I imagine the patches will fail to apply, hail will fail to compile, and it might be marked broken again.)

@cdepillabout
Copy link
Member

cdepillabout commented Nov 7, 2019

@astro Okay, it looks like you fixed everything :-)

I'll merge after CI passes. I've confirmed this builds locally.

@cdepillabout
Copy link
Member

Okay, CI has passed, so merging in.

@astro Thanks again. This should be available when the haskell package set has been regenerated (usually in a week or so).

@cdepillabout cdepillabout merged commit 97982e0 into NixOS:haskell-updates Nov 7, 2019
@astro astro deleted the fix-hail branch November 8, 2019 00:53
@shlevy
Copy link
Member

shlevy commented Nov 8, 2019

Will upload a fixed version of hail to hackage, sorry!

@cdepillabout cdepillabout mentioned this pull request Nov 11, 2019
8 tasks
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

5 participants