Skip to content
This repository has been archived by the owner on Jun 24, 2024. It is now read-only.

Commit

Permalink
Fix Nix build
Browse files Browse the repository at this point in the history
  • Loading branch information
@soareschen
soareschen committed Mar 12, 2024
1 parent 7487a71 commit 72d1413
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 47 deletions.
28 changes: 5 additions & 23 deletions flake.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 4 additions & 9 deletions flake.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,7 @@

sovereign-sdk-src = {
flake = false;
url = git+ssh://[email protected]/informalsystems/sovereign-sdk-wip?rev=5a144d60eefaf9ce166bbfd66324b959aa4ae82b;
};

risc0-cycle-macros-src = {
flake = false;
url = github:Sovereign-Labs/risc0-cycle-macros?rev=98948b8ee0e3edffcee7f3bd95a9d93c5c0941af;
url = git+ssh://[email protected]/informalsystems/sovereign-sdk-wip?rev=3f94ceccae8f84eb191deeb97ce65a1af3c9fd1b;
};

celestia-app-src = {
Expand Down Expand Up @@ -61,8 +56,8 @@
rust-bin = nixpkgs.rust-bin.stable.latest.complete;

risc0-rust-tarball = builtins.fetchurl {
url = "https://github.com/risc0/rust/releases/download/v2024-01-31.1/rust-toolchain-x86_64-unknown-linux-gnu.tar.gz";
sha256 = "sha256:05k8d47zcrascjwwas9pnzg6qz5ambxvfh485flxsn6l7hxq3jf0";
url = "https://github.com/risc0/rust/releases/download/v2024-02-08.1/rust-toolchain-x86_64-unknown-linux-gnu.tar.gz";
sha256 = "sha256:1v4i19wpj9z2zpn2wdf7w1nw5ridwi1linzy0g93wiy09pmz64j9";
};

risc0-circuit = builtins.fetchurl {
Expand All @@ -76,7 +71,7 @@

rollup-packages = import ./nix/rollup.nix {
inherit nixpkgs rust-bin risc0-rust risc0-circuit;
inherit (inputs) sovereign-sdk-src risc0-cycle-macros-src;
inherit (inputs) sovereign-sdk-src;
};

gaia = import ./nix/gaia.nix {
Expand Down
28 changes: 13 additions & 15 deletions nix/rollup.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
, rust-bin
, risc0-rust
, sovereign-sdk-src
, risc0-cycle-macros-src
, risc0-circuit
}:
let
Expand All @@ -16,7 +15,6 @@ let
mkdir -p $out/crates $out/vendor
cp -r . $out/crates
cp -r ${sovereign-sdk-src} $out/vendor/sovereign-sdk
cp -r ${risc0-cycle-macros-src} $out/vendor/risc0-cycle-macros
cp ${../Cargo.toml} $out/Cargo.toml
cp ${../constants.json} $out/constants.json
'';
Expand All @@ -32,7 +30,6 @@ let
mkdir -p $out/crates $out/vendor
cp -r . $out/crates
cp -r ${sovereign-sdk-src} $out/vendor/sovereign-sdk
cp -r ${risc0-cycle-macros-src} $out/vendor/risc0-cycle-macros
cp ${../Cargo.toml} $out/Cargo.toml
cp ${../Cargo.lock} $out/Cargo.lock
cp ${../constants.json} $out/constants.json
Expand All @@ -53,10 +50,10 @@ let
"crypto-bigint-0.5.2" = "sha256-9rh8z3vwOQ7/mtzVbyADoRWgTzARF/nkhBwfKb7+A6I=";
"curve25519-dalek-4.1.0" = "sha256-H8YMea3AIcUn9NGRfataNjCTzCK4NAjo4ZhWuPfT6ts=";
"sha2-0.10.8" = "sha256-vuFQFlbDXEW+n9+Nx2VeWanggCSd6NZ+GVEDFS9qZ2M=";
"ibc-app-transfer-0.50.0" = "sha256-8iWoYw9xX1D/Z+H7IVUP4AoEI4LjL3jzseAOvPBDFbU=";
"ibc-proto-0.41.0" = "sha256-OXqtIFDK5KdYW39EkNGGtfuDvOAMjmxzfnSpm1NWpRc=";
"risc0-cycle-utils-0.3.0" = "sha256-tl6TvAUghcJvlnbD1iYH4mHjgSEtNKsAYN9ZZP69pyc=";
"sov-celestia-client-0.1.0" = "sha256-5o3GYYXfpcqI5qyCSzIKbYmm/wj2Zs+k+6WoVctvfW0=";
"ibc-app-transfer-0.50.0" = "sha256-PakLJz3xIKXfW6iC4mB4KutOfAgn8jC/8t5epysZE5g=";
"ibc-proto-0.41.0" = "sha256-Q3JS+hAYivBZvtlgEM11qDp55d9clNztASNQE505oX8=";
"risc0-cycle-utils-0.3.0" = "sha256-5dA62v1eqfyZBny4s3YlC2Tty7Yfd/OAVGfTlLBgypk=";
"sov-celestia-client-0.1.0" = "sha256-P7Sqf9fhKaf8ZaccYiW83YImaPfefWLDF7HXSYcMQMs=";
};
};

Expand Down Expand Up @@ -94,14 +91,14 @@ let
"celestia-proto-0.1.0" = "sha256-iUgrctxdJUyhfrEQ0zoVj5AKIqgj/jQVNli5/K2nxK0=";
"crypto-bigint-0.5.2" = "sha256-9rh8z3vwOQ7/mtzVbyADoRWgTzARF/nkhBwfKb7+A6I=";
"curve25519-dalek-4.1.0" = "sha256-H8YMea3AIcUn9NGRfataNjCTzCK4NAjo4ZhWuPfT6ts=";
"ibc-app-transfer-0.50.0" = "sha256-8iWoYw9xX1D/Z+H7IVUP4AoEI4LjL3jzseAOvPBDFbU=";
"ibc-proto-0.41.0" = "sha256-OXqtIFDK5KdYW39EkNGGtfuDvOAMjmxzfnSpm1NWpRc=";
"ibc-app-transfer-0.50.0" = "sha256-PakLJz3xIKXfW6iC4mB4KutOfAgn8jC/8t5epysZE5g=";
"ibc-proto-0.41.0" = "sha256-Q3JS+hAYivBZvtlgEM11qDp55d9clNztASNQE505oX8=";
"jmt-0.9.0" = "sha256-pq1v6FXS//6Dh+fdysQIVp+RVLHdXrW5aDx3263O1rs=";
"nmt-rs-0.1.0" = "sha256-jcHbqyIKk8ZDDjSz+ot5YDxROOnrpM4TRmNFVfNniwU=";
"sha2-0.10.8" = "sha256-vuFQFlbDXEW+n9+Nx2VeWanggCSd6NZ+GVEDFS9qZ2M=";
"sov-celestia-client-0.1.0" = "sha256-5o3GYYXfpcqI5qyCSzIKbYmm/wj2Zs+k+6WoVctvfW0=";
"sov-celestia-client-0.1.0" = "sha256-P7Sqf9fhKaf8ZaccYiW83YImaPfefWLDF7HXSYcMQMs=";
"tendermint-0.32.0" = "sha256-FtY7a+hBvQryATrs3mykCWFRe8ABTT6cuf5oh9IBElQ=";
"risc0-cycle-utils-0.3.0" = "sha256-tl6TvAUghcJvlnbD1iYH4mHjgSEtNKsAYN9ZZP69pyc=";
"risc0-cycle-utils-0.3.0" = "sha256-5dA62v1eqfyZBny4s3YlC2Tty7Yfd/OAVGfTlLBgypk=";
};
};

Expand Down Expand Up @@ -142,10 +139,11 @@ let
"tendermint-0.32.0" = "sha256-FtY7a+hBvQryATrs3mykCWFRe8ABTT6cuf5oh9IBElQ=";
"crypto-bigint-0.5.2" = "sha256-9rh8z3vwOQ7/mtzVbyADoRWgTzARF/nkhBwfKb7+A6I=";
"curve25519-dalek-4.1.0" = "sha256-H8YMea3AIcUn9NGRfataNjCTzCK4NAjo4ZhWuPfT6ts=";
"ibc-0.50.0" = "sha256-8iWoYw9xX1D/Z+H7IVUP4AoEI4LjL3jzseAOvPBDFbU=";
"ibc-proto-0.41.0" = "sha256-OXqtIFDK5KdYW39EkNGGtfuDvOAMjmxzfnSpm1NWpRc=";
"sov-celestia-client-0.1.0" = "sha256-5o3GYYXfpcqI5qyCSzIKbYmm/wj2Zs+k+6WoVctvfW0=";
"risc0-cycle-utils-0.3.0" = "sha256-tl6TvAUghcJvlnbD1iYH4mHjgSEtNKsAYN9ZZP69pyc=";
"ibc-0.50.0" = "sha256-PakLJz3xIKXfW6iC4mB4KutOfAgn8jC/8t5epysZE5g=";
"ibc-proto-0.41.0" = "sha256-Q3JS+hAYivBZvtlgEM11qDp55d9clNztASNQE505oX8=";
"sov-celestia-client-0.1.0" = "sha256-P7Sqf9fhKaf8ZaccYiW83YImaPfefWLDF7HXSYcMQMs=";
"risc0-cycle-utils-0.3.0" = "sha256-5dA62v1eqfyZBny4s3YlC2Tty7Yfd/OAVGfTlLBgypk=";
"rockbound-1.0.0" = "sha256-x3yO3BcDdRPmz/p7qnLj+SKgi3meSniTraklWvzULco=";
};
};

Expand Down

0 comments on commit 72d1413

Please sign in to comment.