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
[20.09] haskellPackages.taffybar: overrides to fix build #103898
Conversation
src = pkgs.fetchFromGitHub { | ||
owner = "thestr4ng3r"; | ||
repo = "gi-cairo-render"; | ||
rev = "8727c43cdf91aeedffc9cb4c5575f56660a86399"; | ||
sha256 = "16kqh2ck0dad1l4m6q9xs5jqj9q0vgpqrzb2dc90jk8xwslmmhxd"; | ||
}; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Could you pull this in as a patch instead of updating the source here?
We generally prefer just adding patches, although I guess it is less of a problem on a release branch.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I tried changing it to add the patch fetched from the PR, but the patch doesn't apply cleanly. However when digging around I noticed that master branch of the taffybar/gi-cairo-render fork contains the patch, and it builds too. I hope this is OK @cdepillabout .
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hmm, I don't think I quite understand. If thestr4ng3r/gi-cairo-render
is forked from taffybar/gi-cairo-render
, then is there something preventing you from taking the patch from the diff between them?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
To be honest, I don't quite understand either. There are multiple PRs and forks of this package. But it turns out there is a new hackage version which will work, so I have used that.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks, this looks much simpler now!
@@ -100362,7 +100362,6 @@ self: { | |||
description = "GI friendly Binding to the Cairo library"; | |||
license = stdenv.lib.licenses.lgpl21; | |||
hydraPlatforms = stdenv.lib.platforms.none; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ah, sorry, I should have mentioned this before, but you'll also need to remove these hdyraPlatforms =
lines, otherwise these packages won't get built by Hydra.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
OK done.
Select package versions to make Taffybar work with haskell-gi-base 0.24 and unset broken flags. Resolves NixOS#63500 on the nixos-20.09 branch.
807533b
to
70261a9
Compare
This looks good, everything builds for me and it looks like ofborg is passing. Thanks for working through this with me! |
Motivation for this change
Apply patches to make Taffybar work with haskell-gi-base 0.24. Select versions of dependencies which are compatible with haskell-gi-base 0.24 and clear their broken flag.
Resolves #63500 on the 20.09 branch.
Things done
sandbox
innix.conf
on non-NixOS linux)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
./result/bin/
)