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

Fix ofborg eval #66495

Merged
merged 2 commits into from Aug 11, 2019
Merged

Fix ofborg eval #66495

merged 2 commits into from Aug 11, 2019

Conversation

infinisil
Copy link
Member

@infinisil infinisil commented Aug 11, 2019 •
edited

Motivation for this change

See #66493

I'll also make a PR to make this change permanent to the haskell-updates branch. Edit: Done in 1aa604f and 141ce43

cc @grahamc @worldofpeace @timokau @peti

grahamc
grahamc reviewed Aug 11, 2019
View reviewed changes
pkgs/development/haskell-modules/hackage-packages.nix
@@ -119541,8 +119541,6 @@ self: {
testToolDepends = [ hspec-discover ];
description = "A modern format for Haskell packages";
license = stdenv.lib.licenses.mit;
hydraPlatforms = stdenv.lib.platforms.none;
broken = true;
Copy link
Member

Choose a reason for hiding this comment

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

This might fix eval, but is it actually broken?

Copy link
Member Author

Choose a reason for hiding this comment

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

See #66493 (comment)

Copy link
Member

Choose a reason for hiding this comment

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

Why not keep the hydraPlatforms?

Copy link
Member

Choose a reason for hiding this comment

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

Explained in #66493 (comment)

Copy link
Member Author

Choose a reason for hiding this comment

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

I just did what a package not marked as broken would generate

infinisil added a commit that referenced this pull request Aug 11, 2019
@infinisil
hackage2nix: Unmark hpack as broken
1aa604f 
See #66495
@infinisil
Copy link
Member Author

infinisil commented Aug 11, 2019 •
edited

Permanent fix pushed to haskell-updates branch in 1aa604f

@timokau timokau mentioned this pull request Aug 11, 2019
Closed
worldofpeace
worldofpeace previously approved these changes Aug 11, 2019
View reviewed changes
Copy link
Contributor

@worldofpeace worldofpeace left a comment

Choose a reason for hiding this comment

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

Ran ./maintainers/scripts/eval-release.sh 👍
(I think that's the right script to run)

@worldofpeace
Copy link
Contributor

hmm there's another according to ofborg

Failed to evaluate http-download-0.1.0.0: «broken»: is marked as broken

@worldofpeace worldofpeace dismissed their stale review August 11, 2019 22:25

probably invalid

@infinisil
Copy link
Member Author

Kinda suspected there might be more failures.. lemme see how to fix

@infinisil
Copy link
Member Author

Seems that the same thing happened for pretty much everything @peti fixed the build of

@infinisil
Copy link
Member Author

I think these are all though, pretty sure eval should succeed now, let's see

infinisil added a commit that referenced this pull request Aug 11, 2019
@infinisil
hackage2nix: Unmark pantry and http-download as broken
141ce43 
See #66495
@grahamc
Copy link
Member

grahamc commented Aug 11, 2019

Unfortunately ofborg will always fail the PR because master fails. I've intended on fixing this :/

@worldofpeace
Copy link
Contributor

Unfortunately ofborg will always fail the PR because master fails. I've intended on fixing this :/

Ah I see, though it did seem to progress.

The next eval failure is unrelated to this in

Because of the gdk-pixbuf rename.

@infinisil
Copy link
Member Author

Ideally ofborg would evaluate both master and the (merged) PR, then it can detect:

  • master broken, PR broken -> Eval was broken and PR doesn't fix it, hold on and evaluate again once a PR that fixes eval is merged
  • master broken, PR works -> PR fixes eval, good to merge, trigger above
  • master works, PR broken -> PR breaks eval, blocks merging
  • master works, PR works -> PR doesn't break eval, good to merge

@infinisil
Copy link
Member Author

Ah darn, a pixbuf error.. #61876 and NixOS/cabal2nix#424

@worldofpeace
Copy link
Contributor

@infinisil It appears that's a new addition since yesterday. #66495 (comment)

@infinisil
Copy link
Member Author

Seems that hackage2nix version 2.14.4 was used, not master (which I thought @peti used), so another manual fix like #65487 is needed

@infinisil
Copy link
Member Author

Wait no

@infinisil
Copy link
Member Author

Right, sorry @worldofpeace I didn't really look at your comment close enough, you're right, ignore what I said

@infinisil
Copy link
Member Author

Ah, #66375 is the cause, merged ~30 minutes ago

@worldofpeace
Copy link
Contributor

Right, sorry @worldofpeace I didn't really look at your comment close enough, you're right, ignore what I said

😄 My thought process can go like this as well.

@infinisil infinisil changed the title haskellPackages.hpack: Manually unmark as broken to fix evaluation Fix ofborg eval Aug 11, 2019
@infinisil
Copy link
Member Author

All green, I'll merge

@infinisil infinisil merged commit bb77bbd into NixOS:master Aug 11, 2019
@infinisil infinisil deleted the fix-eval branch August 11, 2019 23:19
@infinisil infinisil mentioned this pull request Aug 11, 2019
Merged
peti pushed a commit that referenced this pull request Aug 12, 2019
@infinisil @peti
hackage2nix: Unmark hpack as broken
29ba5a8 
See #66495
peti pushed a commit that referenced this pull request Aug 12, 2019
@infinisil @peti
hackage2nix: Unmark pantry and http-download as broken
6c8bef9 
See #66495
peti pushed a commit that referenced this pull request Aug 13, 2019
@infinisil @peti
hackage2nix: Unmark hpack as broken
62012f0 
See #66495
peti pushed a commit that referenced this pull request Aug 13, 2019
@infinisil @peti
hackage2nix: Unmark pantry and http-download as broken
1f31972 
See #66495
peti pushed a commit that referenced this pull request Aug 15, 2019
@infinisil @peti
hackage2nix: Unmark hpack as broken
029961f 
See #66495
peti pushed a commit that referenced this pull request Aug 15, 2019
@infinisil @peti
hackage2nix: Unmark pantry and http-download as broken
087e33c 
See #66495
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@grahamc grahamc grahamc left review comments

@timokau timokau timokau left review comments

@worldofpeace worldofpeace worldofpeace left review comments

@basvandijk basvandijk Awaiting requested review from basvandijk

Assignees
No one assigned
Labels
6.topic: haskell 8.has: package (new) 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@infinisil @worldofpeace @grahamc @timokau