Skip to content

Commit

Permalink
Merge branch 'master' into spofford/header-fix
Browse files Browse the repository at this point in the history
  • Loading branch information
adamspofford-dfinity authored Dec 6, 2024
2 parents 23a6647 + 75c56d3 commit bf30bde
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 17 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,12 @@ Your principal for ICP wallets and decentralized exchanges: ueuar-wxbnk-bdcsr-dn
(run `dfx identity get-principal` to display)
```

## Dependencies

### Motoko

Updated Motoko to [0.13.5](https://github.com/dfinity/motoko/releases/tag/0.13.5)

# 0.24.3

### feat: Bitcoin support in PocketIC
Expand Down
18 changes: 9 additions & 9 deletions nix/sources.json
Original file line number Diff line number Diff line change
Expand Up @@ -130,27 +130,27 @@
"builtin": false,
"description": "The Motoko base library",
"owner": "dfinity",
"sha256": "0z3w3yv0kbnkcyqbasbcvi0505vnh5d94jmnv0pw6wy5f75gjq86",
"sha256": "1fviam3c27d49hpqap104dprbd0hm08hf4g4xphkbf8pkmhh3jif",
"type": "tarball",
"url": "https://github.com/dfinity/motoko/releases/download/0.13.4/motoko-base-library.tar.gz",
"url": "https://github.com/dfinity/motoko/releases/download/0.13.5/motoko-base-library.tar.gz",
"url_template": "https://github.com/dfinity/motoko/releases/download/<version>/motoko-base-library.tar.gz",
"version": "0.13.4"
"version": "0.13.5"
},
"motoko-x86_64-darwin": {
"builtin": false,
"sha256": "1i3yx0yxr1v1i2r8g4sskvn34bsiq0jjsa8i8qhmlyp8cc9pnkk7",
"sha256": "0z5zp6l8p2qyz3a2bsrm5sm7q5dm9s1xyfkh4q15gn89g76lj49d",
"type": "file",
"url": "https://github.com/dfinity/motoko/releases/download/0.13.4/motoko-Darwin-x86_64-0.13.4.tar.gz",
"url": "https://github.com/dfinity/motoko/releases/download/0.13.5/motoko-Darwin-x86_64-0.13.5.tar.gz",
"url_template": "https://github.com/dfinity/motoko/releases/download/<version>/motoko-Darwin-x86_64-<version>.tar.gz",
"version": "0.13.4"
"version": "0.13.5"
},
"motoko-x86_64-linux": {
"builtin": false,
"sha256": "0ks7h8q1js2li07k3p8aj7j9nyizys9dyzf1ks7wsbz4i7gwpbbz",
"sha256": "03ggnlnknag4i1536p4am2bvmiqxqsfcfb0h6d13kxw0dhdbcsyg",
"type": "file",
"url": "https://github.com/dfinity/motoko/releases/download/0.13.4/motoko-Linux-x86_64-0.13.4.tar.gz",
"url": "https://github.com/dfinity/motoko/releases/download/0.13.5/motoko-Linux-x86_64-0.13.5.tar.gz",
"url_template": "https://github.com/dfinity/motoko/releases/download/<version>/motoko-Linux-x86_64-<version>.tar.gz",
"version": "0.13.4"
"version": "0.13.5"
},
"pocket-ic-x86_64-darwin": {
"rev": "a62848817cec7ae50618a87a526c85d020283fd9",
Expand Down
16 changes: 8 additions & 8 deletions src/dfx/assets/dfx-asset-sources.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ url = 'https://download.dfinity.systems/ic/a62848817cec7ae50618a87a526c85d020283
sha256 = 'f999d8a7e582bee1dce787d36224f749cf17d52c0623e0752cdbffba47879f4c'

[x86_64-darwin.motoko]
url = 'https://github.com/dfinity/motoko/releases/download/0.13.4/motoko-Darwin-x86_64-0.13.4.tar.gz'
sha256 = '674e7b1363e87a5a214611292d25c0512f32ec9e5a9387b2886187dc3de87ec4'
url = 'https://github.com/dfinity/motoko/releases/download/0.13.5/motoko-Darwin-x86_64-0.13.5.tar.gz'
sha256 = '2d1149cd7909d9570226703adf834eb5157caa2e35eb25d4f81e8b8ba8b9bf7c'
# The replica, canister_sandbox and compiler_sandbox binaries must have the same revision.

[x86_64-darwin.replica]
Expand Down Expand Up @@ -53,8 +53,8 @@ url = 'https://download.dfinity.systems/ic/a62848817cec7ae50618a87a526c85d020283
sha256 = 'fd47abe1876c3bf08246f97908c6badb3cf84ca402d8f4015759883d69689af6'

[x86_64-darwin.motoko-base]
url = 'https://github.com/dfinity/motoko/releases/download/0.13.4/motoko-base-library.tar.gz'
sha256 = '1dfac29c1422f5426dc0cb35df4562dd750f3ad9b3859fbf066a5972457f9146'
url = 'https://github.com/dfinity/motoko/releases/download/0.13.5/motoko-base-library.tar.gz'
sha256 = '7f02ddaffc30f68496697b6308acd2601408a7e182c935f6c3ca8cf843b847c3'

[x86_64-darwin.ic-btc-canister]
url = 'https://github.com/dfinity/bitcoin-canister/releases/download/release%2F2023-10-13/ic-btc-canister.wasm.gz'
Expand All @@ -81,8 +81,8 @@ url = 'https://download.dfinity.systems/ic/a62848817cec7ae50618a87a526c85d020283
sha256 = 'a13497bf7d255b3a235b14967934ec766a93dca1b410ce953880d86fb4b5c422'

[x86_64-linux.motoko]
url = 'https://github.com/dfinity/motoko/releases/download/0.13.4/motoko-Linux-x86_64-0.13.4.tar.gz'
sha256 = '7fadcbdf89e42fcd8f9ec17ddf92f63f7a9be4910add310f885468193082474f'
url = 'https://github.com/dfinity/motoko/releases/download/0.13.5/motoko-Linux-x86_64-0.13.5.tar.gz'
sha256 = 'cf6bb61a6c80f7394233102cc79cc61dc7ba97a88a5c334a88e4293b2db5ef0d'
# The replica, canister_sandbox and compiler_sandbox binaries must have the same revision.

[x86_64-linux.replica]
Expand Down Expand Up @@ -112,8 +112,8 @@ url = 'https://download.dfinity.systems/ic/a62848817cec7ae50618a87a526c85d020283
sha256 = '7b14e2a196dd24ab171990ea755746f4b8c0776eaca64951be4150f83c019099'

[x86_64-linux.motoko-base]
url = 'https://github.com/dfinity/motoko/releases/download/0.13.4/motoko-base-library.tar.gz'
sha256 = '1dfac29c1422f5426dc0cb35df4562dd750f3ad9b3859fbf066a5972457f9146'
url = 'https://github.com/dfinity/motoko/releases/download/0.13.5/motoko-base-library.tar.gz'
sha256 = '7f02ddaffc30f68496697b6308acd2601408a7e182c935f6c3ca8cf843b847c3'

[x86_64-linux.ic-btc-canister]
url = 'https://github.com/dfinity/bitcoin-canister/releases/download/release%2F2023-10-13/ic-btc-canister.wasm.gz'
Expand Down

0 comments on commit bf30bde

Please sign in to comment.