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.

Sign up for GitHub

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

Nixpkgs: Try 20.03 #1266

Merged
merged 19 commits into from
Apr 8, 2020
Merged

Nixpkgs: Try 20.03 #1266

merged 19 commits into from
Apr 8, 2020

Conversation

nomeata
Copy link
Collaborator

@nomeata nomeata commented Mar 4, 2020

still only beta, but to check problems early.

@nomeata
Nixpkgs: Try 20.03
d18d81a 
still only beta, but to check problems early.
@dfinity-ci
Copy link

dfinity-ci commented Mar 4, 2020 •
edited
Loading

In terms of gas, no changes are observed in 2 tests.
In terms of size, no changes are observed in 2 tests.

@nomeata
Copy link
Collaborator Author

nomeata commented Mar 5, 2020

Stuck on https://dfinity.atlassian.net/browse/OPS-17

@nomeata
Copy link
Collaborator Author

nomeata commented Mar 5, 2020

No longer stuck on https://dfinity.atlassian.net/browse/OPS-17. Now stuck on something else (not https://dfinity.atlassian.net/browse/OPS-18, I believe, despite what is said in OPS-17), related to buidling non-dfinity stuff on darwin.

@nomeata
Copy link
Collaborator Author

nomeata commented Mar 19, 2020

Looks like this works now.

@nomeata nomeata marked this pull request as ready for review March 19, 2020 17:24
@nomeata nomeata requested a review from basvandijk March 19, 2020 17:24
@ggreif
Copy link
Contributor

ggreif commented Apr 3, 2020 •
edited
Loading

@basvandijk wanted to look into backporting llvmPackages_10 into the 20.03 release. Is that still the plan? It brings a bunch of Wasm improvements. I'd volunteer if you are occupied otherwise.

@ggreif
Copy link
Contributor

ggreif commented Apr 4, 2020 •
edited
Loading

NixOS/nixpkgs#84094 is now merged. Can we bump this? @nomeata DONE.

@ggreif
Copy link
Contributor

ggreif commented Apr 4, 2020 •
edited
Loading

The hydra results seem bizarre, not sure how to fix... :-(
On my Mac all worked fine.

Might be related to NixOS/nixpkgs#82640, OTOH Linux also has similar logs...

@nomeata
Copy link
Collaborator Author

nomeata commented Apr 6, 2020

The hydra results seem bizarre, not sure how to fix... :-(
On my Mac all worked fine.

Probably because you got the derivation from the nix cache?

Might be related to NixOS/nixpkgs#82640, OTOH Linux also has similar logs...

This bug was filed because I reported the problem that we have to @basvandijk.

But I think we have a different problem, because we get

bsdmake: setrlimit: Invalid argument
builder for '/nix/store/7gh4gk9p213wh508n98p4q71s28vgg5h-adv_cmds-osx-10.5.8.drv' failed with exit code 2

which is a different error message than NixOS/nixpkgs#82640 reports.

Just filed https://dfinity.atlassian.net/browse/OPS-44 to keep this on the Infra team’s radar.

@ggreif
Copy link
Contributor

ggreif commented Apr 6, 2020 •
edited
Loading

Consider including commits 9ac8de6 and e5987d1 from #1316. Also wasmtime-0.12-related c3184b2.
That would also gain us backtraces in wasmtime errors (panics).

@nomeata
Copy link
Collaborator Author

nomeata commented Apr 6, 2020 •
edited by ggreif
Loading

9ac8de6 points to your own nixpkgs fork. Is there a PR against upstream already? And doesn’t that mean we’ll be tied to nixpkgs master again, and not the stable release (unless your change will be backported of course)

@ggreif
Copy link
Contributor

ggreif commented Apr 6, 2020 •
edited
Loading

9ac8de6 points to your own nixpkgs fork.

Yes, that piece (sources.json) should be edited out. release-20.03 should be sufficient.

Ahhh, maybe that doesn't contain wasmtime-0.12. Not a big loss.

@nomeata
Copy link
Collaborator Author

nomeata commented Apr 8, 2020

Just bumped nixpkgs, and suddenly darwin is green! @basvandijk, did you fix something about this? Or are we just lucky?

@nomeata
Copy link
Collaborator Author

nomeata commented Apr 8, 2020

I guess this can go in now, if someone approves.

@nomeata nomeata requested a review from ggreif April 8, 2020 13:06
ggreif
ggreif approved these changes Apr 8, 2020
View reviewed changes
Copy link
Contributor

@ggreif ggreif left a comment

Choose a reason for hiding this comment

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

LGTM!

@nomeata
Copy link
Collaborator Author

nomeata commented Apr 8, 2020

@Mergifyio refresh

@nomeata nomeata added the automerge-squash When ready, merge (using squash) label Apr 8, 2020
@mergify
Copy link
Contributor

mergify bot commented Apr 8, 2020

Command refresh: success

@mergify mergify bot merged commit a169a74 into master Apr 8, 2020
@mergify mergify bot deleted the joachim/nix-20.03 branch April 8, 2020 16:30
@mergify mergify bot removed the automerge-squash When ready, merge (using squash) label Apr 8, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ggreif ggreif ggreif approved these changes

@basvandijk basvandijk Awaiting requested review from basvandijk

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@nomeata @dfinity-ci @ggreif