Skip to content

Commit 21c40c7

Browse files
authored
chore: update dev shell flake (#8314)
Updated to latest Rust toolchain version (v1.79). The rust overlay doesn't use `flake-utils` anymore. Switched to solc 0.8.23 since that's the default for the tests. Moved around the deps to be more in line with recommendations (`buildInputs` for things that get linked and `nativeBuildInputs` for what's needed during compilation only, `packages` for things that are not needed at compile time).
1 parent 82c0404 commit 21c40c7

File tree

2 files changed

+29
-23
lines changed

2 files changed

+29
-23
lines changed

flake.lock

+23-13
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

+6-10
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
url = "github:oxalica/rust-overlay";
77
inputs = {
88
nixpkgs.follows = "nixpkgs";
9-
flake-utils.follows = "flake-utils";
109
};
1110
};
1211
solc = {
@@ -21,7 +20,6 @@
2120
outputs = { self, nixpkgs, rust-overlay, flake-utils, solc }:
2221
flake-utils.lib.eachDefaultSystem (system:
2322
let
24-
overlays = [ (import rust-overlay) ];
2523
pkgs = import nixpkgs {
2624
inherit system;
2725
overlays = [ rust-overlay.overlays.default solc.overlay ];
@@ -35,17 +33,15 @@
3533
devShells.default = pkgs.mkShell {
3634
nativeBuildInputs = with pkgs; [
3735
pkg-config
38-
libusb1
39-
] ++ lib.optionals pkgs.stdenv.isDarwin [
40-
pkgs.darwin.apple_sdk.frameworks.AppKit
41-
];
42-
buildInputs = [
43-
pkgs.rust-analyzer-unwrapped
36+
solc_0_8_23
37+
(solc.mkDefault pkgs solc_0_8_23)
4438
toolchain
4539
];
40+
buildInputs = lib.optionals pkgs.stdenv.isDarwin [
41+
pkgs.darwin.apple_sdk.frameworks.AppKit
42+
];
4643
packages = with pkgs; [
47-
solc_0_8_20
48-
(solc.mkDefault pkgs solc_0_8_20)
44+
rust-analyzer-unwrapped
4945
];
5046

5147
# Environment variables

0 commit comments

Comments
 (0)