Skip to content

default.nix: Remove packaging code#887

Merged
mergify[bot] merged 2 commits intomasterfrom
joachim/nix/no-tar
Nov 19, 2019
Merged

default.nix: Remove packaging code#887
mergify[bot] merged 2 commits intomasterfrom
joachim/nix/no-tar

Conversation

@nomeata
Copy link
Contributor

@nomeata nomeata commented Nov 19, 2019

Judging from how the SDK imports Motoko, all this stuff is not actually
used, so remove it.

Also, they override the buildPhase of stdlib in
https://github.com/dfinity-lab/sdk/blob/master/nix/overlays/motoko.nix
let’s just do this properly here.

Judging from how the SDK imports Motoko, all this stuff is not actually
used, so remove it.

Also, they override the `buildPhase` of `stdlib` in
https://github.com/dfinity-lab/sdk/blob/master/nix/overlays/motoko.nix
let’s just do this properly here.
@hansl hansl requested a review from eftychis November 19, 2019 15:42
forceShare = ["man"];
};

stdlib-doc-live = stdenv.mkDerivation {
Copy link

Choose a reason for hiding this comment

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

The documentation might still be useful. Don’t you publish Motoko doc from this repo?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes, stdlib-doc. Essentially stdlib-doc-live becomes stdlib-doc (as it was some months ago)

@nomeata nomeata requested a review from hansl November 19, 2019 17:18
Copy link

@hansl hansl left a comment

Choose a reason for hiding this comment

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

Looks good to me.

@nomeata nomeata added the automerge-squash When ready, merge (using squash) label Nov 19, 2019
@mergify mergify bot merged commit 6901c53 into master Nov 19, 2019
@mergify mergify bot deleted the joachim/nix/no-tar branch November 19, 2019 21:59
@mergify mergify bot removed the automerge-squash When ready, merge (using squash) label Nov 19, 2019
nomeata added a commit to dfinity/sdk that referenced this pull request Nov 19, 2019
and drop the patching of motoko derivations in the SDK’s overlay, by
pulling in
caffeinelabs/motoko#887 (comment).

```
~/dfinity/motoko $ git log 8676951c41fbf9b9c87c1c4de606d4dfd321a829..6901c536deff066671aa96c6e765d96a7415bb40 --oneline --first-parent
6901c536 (HEAD -> master, origin/master, origin/HEAD) default.nix: Remove packaging code (#887)
b5a74f08 Fix for #874 (#877)
ce3a3107 Merge pull request #841 from dfinity-lab/joachim/ic-stub
cbe634ed Claudio/oneway awaits (#773)
14793c25 IDL-Motoko: Pass actor and func references as data (#883)
abf22153 Update IDL func type (#881)
```
@nomeata nomeata mentioned this pull request Nov 19, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants