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.trifecta: dontCheck on darwin #101602

Merged
merged 1 commit into from Oct 25, 2020
Merged

haskellPackages.trifecta: dontCheck on darwin #101602

merged 1 commit into from Oct 25, 2020

Conversation

zowoq
Copy link
Contributor

@zowoq zowoq commented Oct 24, 2020

https://hydra.nixos.org/build/129070963/nixlog/1

This unblocks nixpkgs-unstable while we're trying to get the cctools problems resolved.

#101442
#101441
#101330

Built shellcheck (and pandoc) on darwin.

cc @vcunat

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.

Normally we like to send PRs touching pkgs/development/haskell-modules/configuration-common.nix to the haskell-updates branch, but since you need this to unbreak master, let's just merge it in to master.

Feel free to merge after ofborg finishes (or before if you've tested it locally and know it should be working).

cc @peti

@vcunat
Copy link
Member

vcunat commented Oct 25, 2020

To be clear, Ofborg builds for darwin won't work, as it's had no darwin builders for weeks.

@zowoq
Copy link
Contributor Author

zowoq commented Oct 25, 2020

Whoops, I missed the notification that it was approved. I've tested pandoc and shellcheck locally.

@zowoq zowoq merged commit 10e961c into NixOS:master Oct 25, 2020
@zowoq zowoq deleted the trifecta branch October 25, 2020 05:59
@r-burns r-burns mentioned this pull request Oct 25, 2020
10 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

3 participants