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.hoggl: fix build #82984

Closed
wants to merge 19 commits into from

Conversation

pschuprikov
Copy link
Contributor

Motivation for this change

hoggl was broken

Things done

Use GitHub upstream

  • 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.

rkrzr and others added 19 commits March 15, 2020 21:56
Also, add myself to the maintainers section for Haskell modules coming
from Hackage.
This update was generated by hackage2nix v2.15.1 from Hackage revision
commercialhaskell/all-cabal-hashes@a155538.
This update was generated by hackage2nix v2.15.1 from Hackage revision
commercialhaskell/all-cabal-hashes@af60c8c.
This update was generated by hackage2nix v2.15.1 from Hackage revision
commercialhaskell/all-cabal-hashes@b0c1d8f.
- tasty-tap's tests were failing. In
  NixOS#71017 a patch generated from a
  PR was applied to fix this.
- That PR has now been merged into tasty-tap and was released with
  version 0.1.0.
- tasty-tap is now at version 0.1.0 in nixpkgs and so the patch fails
  to apply, breaking the build.
- Removed the patch and removed tasty-tap from list of broken
  packages.
- "ekg-core" and "ekg-prometheus-adapter" are no longer broken.
  Removed them from broken packages list.
This update was generated by hackage2nix v2.15.1 from Hackage revision
commercialhaskell/all-cabal-hashes@02fb2c3.
…etheus-adapter

ekg-core,ekg-prometheus-adapter: unmark broken
- prometheus no longer needs to be jailbroken, removing 'doJailbreak'.
  Jailbreaking was added in
  NixOS#70956 to overcome issue
  bitnomial/prometheus#34.
- This issue has since been fixed and so jailbreaking is no longer
  necessary.
…ont-jailbreak

Feature/prometheus dont jailbreak
This update was generated by hackage2nix v2.15.1 from Hackage revision
commercialhaskell/all-cabal-hashes@ba7eac7.
@cdepillabout
Copy link
Member

@pschuprikov Can you see if instead upstream will make a release that fixes this?

@@ -1485,4 +1485,13 @@ self: super: {
sha256 = "097wqn8hxsr50b9mhndg5pjim5jma2ym4ylpibakmmb5m98n17zp";
});

# hackage version does not support newer servant api
hoggl = overrideSrc super.hoggl {
src = pkgs.fetchFromGitHub {
Copy link
Member

Choose a reason for hiding this comment

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

Overriding src with a specific github revision is pretty ugly. The danger we face doing this is that we'll keep shipping the unofficial version even after a new release has been made on Hackage. It would be much better to (a) lobby upstream to release a new version or (b) apply a patch to the existing version so that the build will fail if a new version comes out that has that patch applied already. Then we'll notice that the patch can be dropped.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Oh, yes, thanks! I totally forgot about the appendPatch/fetchpatch option. I'm trying to do (a) in the mean time markus1189/hoggl#12

@peti peti force-pushed the haskell-updates branch 2 times, most recently from b6d2377 to 1b2b886 Compare March 20, 2020 20:12
@peti
Copy link
Member

peti commented Mar 27, 2020

Will you update this PR to get it merged? There are a couple of conflicts. You should probably re-base to the current version of haskell-updates and force-push.

@pschuprikov
Copy link
Contributor Author

Yes, will do today.

@pschuprikov
Copy link
Contributor Author

Since things have started to move with the new hackage version, I guess I can close the PR.

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