Skip to content

Use revision of dev that fixes builds on macOS SDK-34#86

Merged
paulyoung merged 4 commits intomasterfrom
paulyoung/fix-macos-update-nixpkgs
Nov 29, 2018
Merged

Use revision of dev that fixes builds on macOS SDK-34#86
paulyoung merged 4 commits intomasterfrom
paulyoung/fix-macos-update-nixpkgs

Conversation

@paulyoung
Copy link
Copy Markdown
Contributor

@paulyoung paulyoung commented Nov 28, 2018

This relates to https://github.com/dfinity-lab/dev/pull/320, particularly https://github.com/dfinity-lab/dev/commit/e4c100fafebbb5963552fd62c0b552b59c132eb2 in which @nomeata said it was necessary to upgrade nixpkgs because the version used at the time broke ocaml-wasm.

I'm making this PR to try and verify that https://github.com/dfinity-lab/dev/pull/320 both fixes macOS builds and doesn't break ocaml-wasm.

@paulyoung
Copy link
Copy Markdown
Contributor Author

paulyoung commented Nov 28, 2018

I guess actorscript/nix/nixpkgs.nix needs to be manually kept in sync.

@paulyoung
Copy link
Copy Markdown
Contributor Author

paulyoung commented Nov 28, 2018

I'll try referring to the file in dev instead.

@paulyoung
Copy link
Copy Markdown
Contributor Author

paulyoung commented Nov 28, 2018

Jenkins is out of space, will address that and restart the build.

nomeata
nomeata previously requested changes Nov 28, 2018
View reviewed changes
@paulyoung
Copy link
Copy Markdown
Contributor Author

paulyoung commented Nov 29, 2018

I’m inclined to merge this if it’s determined that the build failure here is not a regression. Will look into it.

@paulyoung
Copy link
Copy Markdown
Contributor Author

paulyoung commented Nov 29, 2018

master is already failing with the same test failure, so in the interest of keeping things current I'm going to merge this.

@paulyoung paulyoung dismissed nomeata’s stale review November 29, 2018 01:04

Made the requested changes but @nomeata is now offline

@paulyoung paulyoung merged commit ce02931 into master Nov 29, 2018
@paulyoung paulyoung deleted the paulyoung/fix-macos-update-nixpkgs branch November 29, 2018 01:05
@nomeata
Copy link
Copy Markdown
Contributor

nomeata commented Nov 29, 2018

Oh, I didn’t see that master failed to build. Since e4e7677 it seems. Sorry for that.

@paulyoung
Copy link
Copy Markdown
Contributor Author

paulyoung commented Nov 29, 2018

@nomeata not a problem, just wanted to make sure it wasn't caused by any changes here.

dfinity-bot added a commit that referenced this pull request Oct 28, 2020
@dfinity-bot
niv candid: update a1dcbad4 -> 3e3ad95a
78824ca 
## Changelog for candid:
Branch: 
Commits: [dfinity/candid@a1dcbad4...3e3ad95a](dfinity/candid@a1dcbad...3e3ad95)

* [`119703ba`](dfinity/candid@119703b) [Spec] Relax LEB128 decoding ([dfinity/candid⁠#79](http://r.duckduckgo.com/l/?uddg=https://github.com/dfinity/candid/issues/79))
* [`10f08432`](dfinity/candid@10f0843) Update prim.test.did
* [`b2524816`](dfinity/candid@b252481) parser for test suite ([dfinity/candid⁠#78](http://r.duckduckgo.com/l/?uddg=https://github.com/dfinity/candid/issues/78))
* [`71bf6e76`](dfinity/candid@71bf6e7) release 0.5.2 ([dfinity/candid⁠#80](http://r.duckduckgo.com/l/?uddg=https://github.com/dfinity/candid/issues/80))
* [`b9f387e3`](dfinity/candid@b9f387e) test suite for JS ([dfinity/candid⁠#81](http://r.duckduckgo.com/l/?uddg=https://github.com/dfinity/candid/issues/81))
* [`9e5dc775`](dfinity/candid@9e5dc77) Release ([dfinity/candid⁠#82](http://r.duckduckgo.com/l/?uddg=https://github.com/dfinity/candid/issues/82))
* [`1df9d2d7`](dfinity/candid@1df9d2d) more candid test data ([dfinity/candid⁠#83](http://r.duckduckgo.com/l/?uddg=https://github.com/dfinity/candid/issues/83))
* [`9e4156d9`](dfinity/candid@9e4156d) fix newtype ([dfinity/candid⁠#85](http://r.duckduckgo.com/l/?uddg=https://github.com/dfinity/candid/issues/85))
* [`6880a430`](dfinity/candid@6880a43) display for types ([dfinity/candid⁠#86](http://r.duckduckgo.com/l/?uddg=https://github.com/dfinity/candid/issues/86))
* [`04b1b068`](dfinity/candid@04b1b06) release ([dfinity/candid⁠#87](http://r.duckduckgo.com/l/?uddg=https://github.com/dfinity/candid/issues/87))
* [`117c6436`](dfinity/candid@117c643) Refactor Lexer ([dfinity/candid⁠#89](http://r.duckduckgo.com/l/?uddg=https://github.com/dfinity/candid/issues/89))
* [`0a5789f9`](dfinity/candid@0a5789f) fix value pretty printer ([dfinity/candid⁠#92](http://r.duckduckgo.com/l/?uddg=https://github.com/dfinity/candid/issues/92))
* [`9f35a5aa`](dfinity/candid@9f35a5a) refactor error ([dfinity/candid⁠#94](http://r.duckduckgo.com/l/?uddg=https://github.com/dfinity/candid/issues/94))
* [`2e742927`](dfinity/candid@2e74292) Parse annvals in textual format ([dfinity/candid⁠#93](http://r.duckduckgo.com/l/?uddg=https://github.com/dfinity/candid/issues/93))
* [`0a144c79`](dfinity/candid@0a144c7) use principal from ic-types ([dfinity/candid⁠#84](http://r.duckduckgo.com/l/?uddg=https://github.com/dfinity/candid/issues/84))
* [`01412b14`](dfinity/candid@01412b1) release ([dfinity/candid⁠#95](http://r.duckduckgo.com/l/?uddg=https://github.com/dfinity/candid/issues/95))
* [`f540df54`](dfinity/candid@f540df5) release ([dfinity/candid⁠#98](http://r.duckduckgo.com/l/?uddg=https://github.com/dfinity/candid/issues/98))
* [`798675d8`](dfinity/candid@798675d) Add generic functions to encode/decode around a tuple ([dfinity/candid⁠#99](http://r.duckduckgo.com/l/?uddg=https://github.com/dfinity/candid/issues/99))
* [`0d26e568`](dfinity/candid@0d26e56) release ([dfinity/candid⁠#100](http://r.duckduckgo.com/l/?uddg=https://github.com/dfinity/candid/issues/100))
* [`191b6f1f`](dfinity/candid@191b6f1) Reset record_nesting_depth after each value ([dfinity/candid⁠#101](http://r.duckduckgo.com/l/?uddg=https://github.com/dfinity/candid/issues/101))
* [`8e7be65d`](dfinity/candid@8e7be65) fix record ([dfinity/candid⁠#103](http://r.duckduckgo.com/l/?uddg=https://github.com/dfinity/candid/issues/103))
* [`159533b2`](dfinity/candid@159533b) Update construct.test.did
* [`a6ea0991`](dfinity/candid@a6ea099) add service initialization parameters ([dfinity/candid⁠#88](http://r.duckduckgo.com/l/?uddg=https://github.com/dfinity/candid/issues/88))
* [`3a1f56fa`](dfinity/candid@3a1f56f) refactor: sort dependencies and add traits for error types ([dfinity/candid⁠#105](http://r.duckduckgo.com/l/?uddg=https://github.com/dfinity/candid/issues/105))
* [`89df78ee`](dfinity/candid@89df78e) support service constructor ([dfinity/candid⁠#106](http://r.duckduckgo.com/l/?uddg=https://github.com/dfinity/candid/issues/106))
* [`738d5ed4`](dfinity/candid@738d5ed) fix for actor class codegen ([dfinity/candid⁠#107](http://r.duckduckgo.com/l/?uddg=https://github.com/dfinity/candid/issues/107))
* [`97ba7a0f`](dfinity/candid@97ba7a0) export init args in js ([dfinity/candid⁠#108](http://r.duckduckgo.com/l/?uddg=https://github.com/dfinity/candid/issues/108))
* [`d4e00adc`](dfinity/candid@d4e00ad) fix js init export ([dfinity/candid⁠#109](http://r.duckduckgo.com/l/?uddg=https://github.com/dfinity/candid/issues/109))
* [`c1662abe`](dfinity/candid@c1662ab) [spec] Reverse subtyping ([dfinity/candid⁠#110](http://r.duckduckgo.com/l/?uddg=https://github.com/dfinity/candid/issues/110))
* [`713595be`](dfinity/candid@713595b) The “reverse variant extension rule” is redundand ([dfinity/candid⁠#113](http://r.duckduckgo.com/l/?uddg=https://github.com/dfinity/candid/issues/113))
* [`79d49a01`](dfinity/candid@79d49a0) Spec: Opt decoding also from non-opt values ([dfinity/candid⁠#114](http://r.duckduckgo.com/l/?uddg=https://github.com/dfinity/candid/issues/114))
* [`2cfc0ecf`](dfinity/candid@2cfc0ec) improve pretty printing for values ([dfinity/candid⁠#116](http://r.duckduckgo.com/l/?uddg=https://github.com/dfinity/candid/issues/116))
* [`8fafe345`](dfinity/candid@8fafe34) Un-rename Soundness document ([dfinity/candid⁠#115](http://r.duckduckgo.com/l/?uddg=https://github.com/dfinity/candid/issues/115))
* [`8e6fc502`](dfinity/candid@8e6fc50) Bump spec version ([dfinity/candid⁠#112](http://r.duckduckgo.com/l/?uddg=https://github.com/dfinity/candid/issues/112))
* [`7cedebcb`](dfinity/candid@7cedebc) fix clippy ([dfinity/candid⁠#117](http://r.duckduckgo.com/l/?uddg=https://github.com/dfinity/candid/issues/117))
* [`a732a639`](dfinity/candid@a732a63) Candid UI Canister ([dfinity/candid⁠#111](http://r.duckduckgo.com/l/?uddg=https://github.com/dfinity/candid/issues/111))
* [`d97b271c`](dfinity/candid@d97b271) disable pretty printing for large vectors ([dfinity/candid⁠#118](http://r.duckduckgo.com/l/?uddg=https://github.com/dfinity/candid/issues/118))
* [`aceb7f92`](dfinity/candid@aceb7f9) derive candid type for functions ([dfinity/candid⁠#119](http://r.duckduckgo.com/l/?uddg=https://github.com/dfinity/candid/issues/119))
* [`c3dc0ad7`](dfinity/candid@c3dc0ad) rename derived code for CDK ([dfinity/candid⁠#120](http://r.duckduckgo.com/l/?uddg=https://github.com/dfinity/candid/issues/120))
* [`d1f8de7d`](dfinity/candid@d1f8de7) release ([dfinity/candid⁠#121](http://r.duckduckgo.com/l/?uddg=https://github.com/dfinity/candid/issues/121))
* [`3e3ad95a`](dfinity/candid@3e3ad95) remove multi-line string in test suites ([dfinity/candid⁠#125](http://r.duckduckgo.com/l/?uddg=https://github.com/dfinity/candid/issues/125))
dfinity-bot added a commit that referenced this pull request Jun 18, 2022
@dfinity-bot
niv ic-hs: update 91832636 -> 173cbe84
c6aa964 
## Changelog for ic-hs:
Branch: master
Commits: [dfinity/ic-hs@91832636...173cbe84](dfinity/ic-hs@9183263...173cbe8)

* [`c02f5358`](dfinity/ic-hs@c02f535) Revert ".github/workflows/release.yml: disable MacOS builds in release job ([dfinity/ic-hs⁠#82](https://github.com/dfinity/ic-hs/issues/82))" ([dfinity/ic-hs⁠#86](https://github.com/dfinity/ic-hs/issues/86))
* [`173cbe84`](dfinity/ic-hs@173cbe8) fix: macos release ([dfinity/ic-hs⁠#87](https://github.com/dfinity/ic-hs/issues/87))
mergify bot pushed a commit that referenced this pull request Jun 18, 2022
@dfinity-bot
niv ic-hs: update 91832636 -> 173cbe84 (#3322)
0de0fa1 
## Changelog for ic-hs:
Branch: master
Commits: [dfinity/ic-hs@91832636...173cbe84](dfinity/ic-hs@9183263...173cbe8)

* [`c02f5358`](dfinity/ic-hs@c02f535) Revert ".github/workflows/release.yml: disable MacOS builds in release job ([dfinity/ic-hs⁠#82](https://github.com/dfinity/ic-hs/issues/82))" ([dfinity/ic-hs⁠#86](https://github.com/dfinity/ic-hs/issues/86))
* [`173cbe84`](dfinity/ic-hs@173cbe8) fix: macos release ([dfinity/ic-hs⁠#87](https://github.com/dfinity/ic-hs/issues/87))
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@nomeata nomeata nomeata left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@paulyoung @nomeata