Skip to content

Commit

Permalink
[cron] Update source dependencies (#63)
Browse files Browse the repository at this point in the history
* Update source dependencies
* Update sha256
  • Loading branch information
ninegua committed Jul 4, 2023
1 parent bf09684 commit 57216df
Show file tree
Hide file tree
Showing 5 changed files with 30 additions and 55 deletions.
2 changes: 1 addition & 1 deletion ic.nix
Expand Up @@ -94,7 +94,7 @@ let
else
[ libunwind-static ]);
cargoSha256 =
"sha256-nYTjsnG5Yc+V/KqX6pbhew89N/JjPlehOJe3/U7nuKk="; # cargoSha256
"sha256-QjscD5BThUw1A/i7R7wi07UY86wcwXxdoIYmwPeCSxQ="; # cargoSha256
doCheck = false;

ROCKSDB_LIB_DIR = "${rocksdb}/lib";
Expand Down
49 changes: 12 additions & 37 deletions nix/sdk-ic-certification-0.23.2.patch
@@ -1,55 +1,30 @@
diff --git a/Cargo.lock b/Cargo.lock
index 04fd0f94..3206303d 100644
index 5f2975a8..3a71340d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1969,7 +1969,7 @@ dependencies = [
"http",
"http-body",
"hyper-rustls",
- "ic-certification 0.23.2 (git+https://github.com/dfinity/agent-rs.git?rev=862ddb2871db426d0e42e816a2f792d224d7bdf5)",
+ "ic-certification",
"ic-verify-bls-signature",
"k256",
"leb128",
@@ -2049,16 +2049,6 @@ dependencies = [
"syn 1.0.109",
]

-[[package]]
-name = "ic-certification"
-version = "0.23.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "beb68e0ea2fe6b533ddab6ae2142274f9669acacbacd83ac64bb1cd268d33104"
-dependencies = [
- "hex",
- "sha2 0.10.6",
-]
-
@@ -2092,8 +2092,7 @@ dependencies = [
[[package]]
name = "ic-certification"
version = "0.23.2"
@@ -2133,7 +2123,7 @@ dependencies = [
"candid 0.8.4",
"flate2",
"http",
- "ic-certification 0.23.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ic-certification",
"leb128",
"log",
"miracl_core_bls12381",
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "beb68e0ea2fe6b533ddab6ae2142274f9669acacbacd83ac64bb1cd268d33104"
+source = "git+https://github.com/dfinity/agent-rs.git?rev=862ddb2871db426d0e42e816a2f792d224d7bdf5#862ddb2871db426d0e42e816a2f792d224d7bdf5"
dependencies = [
"hex",
"sha2 0.10.6",
diff --git a/Cargo.toml b/Cargo.toml
index 65469051..76704bb4 100644
index 7bfd6cee..7b077ccc 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -71,6 +71,11 @@ version = "0.23.2"
@@ -72,6 +72,11 @@ version = "0.24.1"
git = "https://github.com/dfinity/agent-rs.git"
rev = "862ddb2871db426d0e42e816a2f792d224d7bdf5"
rev = "b9c57f8bab23cc9936dca4560293ffe485471c6d"

+[patch.crates-io.ic-certification]
+version = "0.23.2"
+git = "https://github.com/dfinity/agent-rs.git"
+rev = "862ddb2871db426d0e42e816a2f792d224d7bdf5"
+
[patch.crates-io.ic-identity-hsm]
version = "0.23.2"
version = "0.24.1"
git = "https://github.com/dfinity/agent-rs.git"
28 changes: 14 additions & 14 deletions nix/sources.nix
@@ -1,8 +1,8 @@
{ fetchgit }: {
ic = fetchgit {
url = "https://github.com/dfinity/ic"; # master
rev = "b314222935b7d06c70036b0b54aa80a33252d79c"; # pin
sha256 = "1rgi489c93839q5avpxpkyhdrn52jc49l6hks4cnqi73a81nrrw2";
rev = "ef8ca68771baa20a14af650ab89c9b31b1dc9a5e"; # pin
sha256 = "0cmmmzay348xwalfh7fq02csbzyxj7l835qd38h3f4gs17ylhkjj";
};
icx-proxy = fetchgit {
url = "https://github.com/dfinity/icx-proxy"; # master
Expand All @@ -21,13 +21,13 @@
};
motoko = fetchgit {
url = "https://github.com/dfinity/motoko"; # master
rev = "bbad160b25abeced4d55a2c2d9b4563d58728773";
sha256 = "111kqhk09vxk4b1r4h4bzldmrsw50b18mks3q01gyxmv91ql9fjc";
rev = "f2ea70ee8865d1888e7b96180c31aeb9e7ed5eb9";
sha256 = "0xbmp4mkvh38c8wf0i6fzzxjfwgh9s4z780han44bakqn4mpx2yc";
};
motoko-base = fetchgit {
url = "https://github.com/dfinity/motoko-base"; # next-moc
rev = "a16022115032d64c136ddac1ef81e59261bbfb66";
sha256 = "0f4hsa1dl1j20cni7c1w8z4a8kfkisaafrsbf9xsrh4h4p33l6n7";
rev = "26b254ed962e564e5d991eb8caee8fd1bb7845d1";
sha256 = "1yd6s5aa2wp113kndnygfkzfga12kfrixi9mxvwllzfhgi9kcpfl";
};
musl-wasi = fetchgit {
url = "https://github.com/WebAssembly/wasi-libc"; # main
Expand All @@ -36,8 +36,8 @@
};
sdk = fetchgit {
url = "https://github.com/dfinity/sdk"; # master
rev = "891055d99ae70f01796013277f40a3da3cc18fc4";
sha256 = "0bdxv7i5pwihwwdbwb32aah5g3pxsjnbsqzsw6fra7yrgk1hd8lp";
rev = "14649c82cc4756707ab07a773b897496fb5b30cf";
sha256 = "1wshhy2wq96xngbf22vbympyg8r7rdr70fpfbd5cbl4m15vyrsrx";
};
lmdb = fetchgit {
url = "https://git.openldap.org/openldap/openldap.git"; # mdb.master
Expand All @@ -51,18 +51,18 @@
};
ic-repl = fetchgit {
url = "https://github.com/chenyan2002/ic-repl"; # master
rev = "515db48a43daaaff6a72c4c1a42bb5e4299bc74a";
sha256 = "1fgs3wc4fm36nik9292bfl39hsw1vayv95bqnnpppg4l8kv34i17";
rev = "b85b1482404507961c832eaadef760087333d2b5";
sha256 = "0ccdgj9azgkkqcfhvhw16mjm0rvijzxp8h77apwqqwkm77agiyni";
};
ic-wasm = fetchgit {
url = "https://github.com/dfinity/ic-wasm"; # master
rev = "96bb59a03c930fc5708b7c779666fd3da2f07c6b";
sha256 = "0wb3j09p596w8qnfk6zqgkp6r00m06zrspzlxkivjc1k632kyk0f";
rev = "adca2dece3ec1456aa381b3cac28752376f5c88e";
sha256 = "sha256-V5xFkGCVXPQEkBn3ydz8IT0WnsfH+ChQpSxNt+GmSsI=";
};
candid = fetchgit {
url = "https://github.com/dfinity/candid"; # master
rev = "e212e096cb726548c6d6edba1189375dc5ad364e";
sha256 = "0wixm6xiwbdb6bq783zniaygh161gzsspsrw60izs1r9xfcx2h0r";
rev = "199fd05b4524ded8eec5fa74da788be0a5a14319";
sha256 = "0qm68s2dvdfggafbyix6c1k2pcw85ykd4am883781m6zq3g0ilnh";

};

Expand Down
2 changes: 1 addition & 1 deletion sdk.nix
Expand Up @@ -15,7 +15,7 @@ let
name = "dfx";
inherit src;
cargoSha256 =
"sha256-kYFNnAJr2j2hq6QMYgUZa+2dIltwEZLQnCLqQjfIsMw="; # cargoSha256
"sha256-+zgGepjpkimKQKXBLc83aNZCdOtBcXuvn9jAGjC86x0="; # cargoSha256
inherit buildInputs;
nativeBuildInputs = [ perl pkg-config cmake binaryen python3 ];
cargoPatches = [ ./nix/sdk-ic-certification-0.23.2.patch ];
Expand Down
4 changes: 2 additions & 2 deletions utils.nix
Expand Up @@ -27,9 +27,9 @@ in rec {
ic-repl = mkDrv "ic-repl"
"sha256-5yLIoWIThmsAdb28/+qrGHpI78RHXBEM/sFlui8BhYw="; # cargoSha256
ic-wasm = mkDrv_ [ ] true [ ] "ic-wasm"
"sha256-MNbKiYZBkUDYJJ+tWy1rjG53jHcF5d1Yrc6DfelyfGY="; # cargoSha256
"sha256-iGCju0JG+jkysmDAeTfjNCYaSfg7N3Qqq8HpPlRHMgU="; # cargoSha256
candid = mkDrv_ [ ] false [ ] "candid"
"sha256-pc+wyvAa6IkgHXmPAZrvdoFcNbwgkRzcdbK63s0uZXc="; # cargoSha256
"sha256-mf/+c0mV9CeUSi0Y6z4qat4zTm5CjYWODLoqRWPiBRo="; # cargoSha256

shell = ic-wasm;
}

0 comments on commit 57216df

Please sign in to comment.