Skip to content

Commit 6e38b5d

Browse files
galin-sgalin-s
committed
config(packages): Switch from rust-overlay to fenix
1 parent 925db50 commit 6e38b5d

File tree

10 files changed

+98
-146
lines changed

10 files changed

+98
-146
lines changed

‎flake.lock‎

Lines changed: 0 additions & 43 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎flake.nix‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -28,16 +28,6 @@
2828
ethereum_nix.follows = "nixos-modules/ethereum-nix";
2929
treefmt-nix.follows = "nixos-modules/treefmt-nix";
3030
devenv.follows = "nixos-modules/devenv";
31-
32-
rust-overlay = {
33-
url = "github:oxalica/rust-overlay";
34-
inputs.nixpkgs.follows = "nixpkgs";
35-
};
36-
37-
rust-overlay-2024-08-01 = {
38-
url = "github:oxalica/rust-overlay?ref=snapshot/2024-08-01";
39-
inputs.nixpkgs.follows = "nixpkgs";
40-
};
4131
};
4232

4333
outputs =

‎packages/all-packages.nix‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
{
55
pkgs,
66
self',
7+
inputs',
78
...
89
}:
910
let
@@ -17,12 +18,10 @@
1718
inherit (pkgs.lib) optionalAttrs callPackageWith;
1819
inherit (self'.legacyPackages)
1920
rustPlatformStable
20-
craneLib-stable
21-
craneLib-nightly
21+
craneLib-fenix-stable
22+
craneLib-fenix-latest
2223
cardano-node
2324
cardano-cli
24-
pkgs-with-rust-overlay
25-
rust-bin-2024-08-01
2625
;
2726
python3Packages = pkgs.python3Packages;
2827

@@ -95,7 +94,7 @@
9594
cardano = callPackage ./cardano/default.nix { inherit cardano-cli cardano-node graphql; };
9695

9796
polkadot-generic = callPackage ./polkadot/default.nix {
98-
craneLib = craneLib-stable;
97+
craneLib = craneLib-fenix-stable;
9998
inherit (darwin) libiconv;
10099
inherit (darwinPkgs)
101100
CoreFoundation
@@ -153,11 +152,10 @@
153152
};
154153

155154
args-zkVM = {
156-
inherit (pkgs-with-rust-overlay) rust-bin;
157-
inherit craneLib-nightly;
155+
rustFromToolchainFile = inputs'.fenix.packages.fromToolchainFile;
156+
craneLib = craneLib-fenix-latest;
158157
inherit fetchGitHubFile;
159158
inherit installSourceAndCargo;
160-
inherit rust-bin-2024-08-01;
161159
};
162160

163161
args-zkVM-rust = {
@@ -172,8 +170,8 @@
172170
blst = callPackage ./blst { };
173171
bnb-beacon-node = callPackage ./bnb-beacon-node { };
174172

175-
circom = callPackage ./circom/default.nix { craneLib = craneLib-stable; };
176-
circ = callPackage ./circ/default.nix { craneLib = craneLib-stable; };
173+
circom = callPackage ./circom/default.nix { craneLib = craneLib-fenix-stable; };
174+
circ = callPackage ./circ/default.nix { craneLib = craneLib-fenix-stable; };
177175

178176
emscripten = pkgs.emscripten.overrideAttrs (_old: {
179177
postInstall = ''

‎packages/default.nix‎

Lines changed: 36 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -17,29 +17,39 @@
1717
...
1818
}:
1919
let
20-
pkgs-with-rust-overlay =
21-
let
22-
rust-overlay = inputs.rust-overlay.overlays.default;
23-
in
24-
pkgs.extend rust-overlay;
25-
26-
rust-stable = pkgs-with-rust-overlay.rust-bin.stable.latest.default.override {
27-
extensions = [ "rust-src" ];
28-
targets = [
29-
"wasm32-wasip1"
30-
"wasm32-unknown-unknown"
20+
rust-stable =
21+
with inputs'.fenix.packages;
22+
with stable;
23+
combine [
24+
cargo
25+
clippy
26+
rust-analyzer
27+
rust-src
28+
rustc
29+
rustfmt
30+
targets.wasm32-unknown-unknown.stable.rust-std
31+
targets.wasm32-wasip1.stable.rust-std
32+
targets.wasm32-wasip2.stable.rust-std
3133
];
32-
};
33-
rust-nightly = pkgs-with-rust-overlay.rust-bin.nightly.latest.default.override {
34-
extensions = [ "rust-src" ];
35-
targets = [
36-
"wasm32-wasip1"
37-
"wasm32-unknown-unknown"
34+
35+
rust-latest =
36+
with inputs'.fenix.packages;
37+
with latest;
38+
combine [
39+
cargo
40+
clippy
41+
rust-analyzer
42+
rust-src
43+
rustc
44+
rustfmt
45+
targets.wasm32-unknown-unknown.latest.rust-std
46+
targets.wasm32-wasip1.latest.rust-std
47+
targets.wasm32-wasip2.latest.rust-std
3848
];
39-
};
4049

41-
craneLib-stable = (inputs.crane.mkLib pkgs).overrideToolchain rust-stable;
42-
craneLib-nightly = (inputs.crane.mkLib pkgs).overrideToolchain rust-nightly;
50+
craneLib = inputs.crane.mkLib pkgs;
51+
craneLib-fenix-stable = craneLib.overrideToolchain rust-stable;
52+
craneLib-fenix-latest = craneLib.overrideToolchain rust-latest;
4353

4454
cardano-node = builtins.getFlake "github:input-output-hk/cardano-node/f0b4ac897dcbefba9fa0d247b204a24543cf55f6";
4555

@@ -86,21 +96,19 @@
8696

8797
inherit
8898
rust-stable
89-
rust-nightly
90-
craneLib-stable
91-
craneLib-nightly
92-
pkgs-with-rust-overlay
99+
rust-latest
100+
craneLib
101+
craneLib-fenix-stable
102+
craneLib-fenix-latest
93103
;
94104

95-
rust-bin-2024-08-01 = inputs.rust-overlay-2024-08-01.lib.mkRustBin { } pkgs;
96-
97105
rustPlatformStable = pkgs.makeRustPlatform {
98106
rustc = rust-stable;
99107
cargo = rust-stable;
100108
};
101109
rustPlatformNightly = pkgs.makeRustPlatform {
102-
rustc = rust-nightly;
103-
cargo = rust-nightly;
110+
rustc = rust-latest;
111+
cargo = rust-latest;
104112
};
105113
};
106114
};

‎packages/jolt/default.nix‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2-
rust-bin,
3-
craneLib-nightly,
2+
rustFromToolchainFile,
3+
craneLib,
44
fetchFromGitHub,
55
fetchGitHubFile,
66
installSourceAndCargo,
@@ -32,17 +32,17 @@ let
3232
};
3333
};
3434

35-
rust-toolchain = rust-bin.fromRustupToolchainFile (fetchGitHubFile {
36-
inherit (commonArgs.src) owner repo rev;
37-
file = "rust-toolchain.toml";
38-
hash = "sha256-Fyj+Bp/dt3epuTN9kXN+r7Z3gzXYCDrcVEPWTr1sQqk=";
39-
});
40-
craneLib = craneLib-nightly.overrideToolchain rust-toolchain;
41-
cargoArtifacts = craneLib.buildDepsOnly commonArgs;
35+
rustToolchain = rustFromToolchainFile {
36+
dir = commonArgs.src;
37+
sha256 = "sha256-eRCZskam9/DrpAVsoMyvSY7TLnl0E5gfN8FK4gcgZBo=";
38+
};
39+
40+
craneLibOverride = craneLib.overrideToolchain rustToolchain;
41+
cargoArtifacts = craneLibOverride.buildDepsOnly commonArgs;
4242
in
43-
craneLib.buildPackage (
43+
craneLibOverride.buildPackage (
4444
commonArgs
45-
// (installSourceAndCargo rust-toolchain)
45+
// (installSourceAndCargo rustToolchain)
4646
// rec {
4747
inherit cargoArtifacts;
4848

@@ -61,7 +61,7 @@ craneLib.buildPackage (
6161
then
6262
export PATH="${jolt-guest-rust}/rust/build/host/stage2/bin:\$PATH"
6363
fi
64-
${rust-toolchain}/bin/cargo \$@
64+
${rustToolchain}/bin/cargo \$@
6565
EOF
6666
chmod +x $out/bin/cargo
6767
'';

‎packages/nexus/default.nix‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2-
rust-bin,
3-
craneLib-nightly,
2+
rustFromToolchainFile,
3+
craneLib,
44
fetchFromGitHub,
55
installSourceAndCargo,
66
pkg-config,
@@ -30,15 +30,16 @@ let
3030
};
3131
};
3232

33-
rust-toolchain = rust-bin.nightly."2025-01-02".default.override {
34-
targets = [ "riscv32i-unknown-none-elf" ];
33+
rustToolchain = rustFromToolchainFile {
34+
dir = commonArgs.src;
35+
sha256 = "sha256-J0fzDFBqvXT2dqbDdQ71yt2/IKTq4YvQs6QCSkmSdKY=";
3536
};
36-
craneLib = craneLib-nightly.overrideToolchain rust-toolchain;
37-
cargoArtifacts = craneLib.buildDepsOnly commonArgs;
37+
craneLibOverride = craneLib.overrideToolchain rustToolchain;
38+
cargoArtifacts = craneLibOverride.buildDepsOnly commonArgs;
3839
in
39-
craneLib.buildPackage (
40+
craneLibOverride.buildPackage (
4041
commonArgs
41-
// (installSourceAndCargo rust-toolchain)
42+
// (installSourceAndCargo rustToolchain)
4243
// rec {
4344
inherit cargoArtifacts;
4445

‎packages/risc0/default.nix‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
risc0-rust,
3-
rust-bin,
4-
craneLib-nightly,
3+
rustFromToolchainFile,
4+
craneLib,
55
fetchurl,
66
fetchFromGitHub,
77
fetchGitHubFile,
@@ -43,17 +43,16 @@ let
4343
};
4444
};
4545

46-
rust-toolchain = rust-bin.fromRustupToolchainFile (fetchGitHubFile {
47-
inherit (commonArgs.src) owner repo rev;
48-
file = "rust-toolchain.toml";
49-
hash = "sha256-n7Jr8rkovVQ98/KNvSg9EG9JZmKWD7DTaXTbpDJKA0Q=";
50-
});
51-
craneLib = craneLib-nightly.overrideToolchain rust-toolchain;
52-
cargoArtifacts = craneLib.buildDepsOnly commonArgs;
46+
rustToolchain = rustFromToolchainFile {
47+
dir = commonArgs.src;
48+
sha256 = "sha256-s1RPtyvDGJaX/BisLT+ifVfuhDT1nZkZ1NcK8sbwELM=";
49+
};
50+
craneLibOverride = craneLib.overrideToolchain rustToolchain;
51+
cargoArtifacts = craneLibOverride.buildDepsOnly commonArgs;
5352
in
54-
craneLib.buildPackage (
53+
craneLibOverride.buildPackage (
5554
commonArgs
56-
// (installSourceAndCargo rust-toolchain)
55+
// (installSourceAndCargo rustToolchain)
5756
// rec {
5857
inherit cargoArtifacts;
5958

‎packages/sp1/default.nix‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
sp1-rust,
3-
craneLib-nightly,
3+
craneLib,
44
fetchFromGitHub,
55
fetchGitHubFile,
66
installSourceAndCargo,
@@ -27,13 +27,13 @@ let
2727
};
2828
};
2929

30-
rust-toolchain = sp1-rust;
31-
craneLib = craneLib-nightly.overrideToolchain rust-toolchain;
32-
cargoArtifacts = craneLib.buildDepsOnly commonArgs;
30+
rustToolchain = sp1-rust;
31+
craneLibOverride = craneLib.overrideToolchain rustToolchain;
32+
cargoArtifacts = craneLibOverride.buildDepsOnly commonArgs;
3333
in
34-
craneLib.buildPackage (
34+
craneLibOverride.buildPackage (
3535
commonArgs
36-
// (installSourceAndCargo rust-toolchain)
36+
// (installSourceAndCargo rustToolchain)
3737
// rec {
3838
inherit cargoArtifacts;
3939

‎packages/zkm/default.nix‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
zkm-rust,
3-
craneLib-nightly,
3+
craneLib,
44
fetchFromGitHub,
55
installSourceAndCargo,
66
fetchzip,
@@ -29,13 +29,13 @@ let
2929
};
3030
};
3131

32-
rust-toolchain = zkm-rust;
33-
craneLib = craneLib-nightly.overrideToolchain rust-toolchain;
34-
cargoArtifacts = craneLib.buildDepsOnly commonArgs;
32+
rustToolchain = zkm-rust;
33+
craneLibOverride = craneLib.overrideToolchain rustToolchain;
34+
cargoArtifacts = craneLibOverride.buildDepsOnly commonArgs;
3535
in
36-
craneLib.buildPackage (
36+
craneLibOverride.buildPackage (
3737
commonArgs
38-
// (installSourceAndCargo rust-toolchain)
38+
// (installSourceAndCargo rustToolchain)
3939
// rec {
4040
inherit cargoArtifacts;
4141

@@ -57,7 +57,7 @@ craneLib.buildPackage (
5757
: \''${SEG_FILE_DIR:='/tmp/output'}
5858
LD_LIBRARY_PATH="\''${LD_LIBRARY_PATH-}:${openssl.out}/lib"
5959
export RUST_LOG BASEDIR SEG_SIZE ARGS SEG_OUTPUT SEG_FILE_DIR LD_LIBRARY_PATH
60-
${rust-toolchain}/bin/cargo \$@
60+
${rustToolchain}/bin/cargo \$@
6161
EOF
6262
chmod +x "$out"/bin/cargo
6363
'';

0 commit comments

Comments
 (0)