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

Jump to bottom

[haskell-updates] haskellPackages: Fix gtk2hs packages #91319

Merged
merged 1 commit into from Jun 24, 2020
Merged

[haskell-updates] haskellPackages: Fix gtk2hs packages #91319

merged 1 commit into from Jun 24, 2020

Conversation

maralorn
Copy link
Member

glib and friends have been bumped to 0.13.8.1 so we can drop a patch
picked from that version.

I don‘t have a darwin system available, but the removed patch was fixing a darwin problem.
From looking at the changes I am confident I am doing the right thing, but I‘d appreciate if someone could test those packages on darwin.

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 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
haskellPackages: Fix gtk2hs packages
71801d2 
glib and friends have been bumped to 0.13.8.1 so we can drop a patch
picked from that version.
@maralorn
Copy link
Member Author

Compare: https://hydra.nixos.org/build/122874321/nixlog/1

Also @cdepillabout do I have a way to trigger ofBorg test builds?

@cdepillabout
Copy link
Member

@maralorn If you send a PR adding yourself as a user, you should be able to use the ofborg commands for compiling packages. If you add yourself as a trusted user, ofborg will also compile stuff on darwin for you by default.

@GrahamcOfBorg build haskellPackages.glib
@GrahamcOfBorg build haskellPackages.gio
@GrahamcOfBorg build haskellPackages.pango
@GrahamcOfBorg build haskellPackages.gtk3
@GrahamcOfBorg build haskellPackages.gtk

@cole-h
Copy link
Member

cole-h commented Jun 23, 2020 •
edited

@cdepillabout Slight correction: Anybody can run builds, tests, or evals since a while ago. The only stipulation is that Darwin builds and tests require being a trusted user in ofborg's configuration.

EDIT: https://github.com/NixOS/ofborg#trusted-users

@cdepillabout
Copy link
Member

For some reason the darwin CI machines aren't running.

I'll go ahead and merge this in, but if someone in the future has a problem with building these packages on darwin, let's make sure to fix this up.

@cdepillabout cdepillabout merged commit 2b7f5c4 into NixOS:haskell-updates Jun 24, 2020
@maralorn maralorn deleted the fix-glib branch June 24, 2020 07:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@cdepillabout cdepillabout Awaiting requested review from cdepillabout

Assignees
No one assigned
Labels
6.topic: haskell 10.rebuild-darwin: 11-100 10.rebuild-linux: 11-100
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@maralorn @cdepillabout @cole-h