Skip to content

Commit 932e2e6

Browse files
authored
Update forge std, git submodule command & nix flake for solidity compiler (#1368)
* include solc_0_8_19 in nix flake * use latest forge-std * fix git:submodule:sync command
1 parent b2711c3 commit 932e2e6

File tree

5 files changed

+61
-12
lines changed

5 files changed

+61
-12
lines changed

.gitmodules

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
[submodule "lib/forge-std"]
22
path = lib/forge-std
33
url = https://github.com/foundry-rs/forge-std
4-
branch = v1.3.0

flake.lock

Lines changed: 38 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 21 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,34 @@
44
inputs = {
55
nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
66
flake-utils.url = "github:numtide/flake-utils";
7-
foundry.url = "github:shazow/foundry.nix/monthly";
8-
foundry.inputs.nixpkgs.follows = "nixpkgs";
7+
foundry = {
8+
url = "github:shazow/foundry.nix/monthly";
9+
inputs.nixpkgs.follows = "nixpkgs";
10+
};
11+
solc = {
12+
url = "github:hellwolf/solc.nix";
13+
inputs.nixpkgs.follows = "nixpkgs";
14+
};
915
};
1016

11-
outputs = { self, nixpkgs, flake-utils, foundry } :
17+
outputs = { self, nixpkgs, flake-utils, foundry, solc } :
1218
flake-utils.lib.eachDefaultSystem (system:
1319
let
14-
pkgs = import nixpkgs { inherit system; };
20+
pkgs = import nixpkgs {
21+
inherit system;
22+
overlays = [
23+
foundry.overlay
24+
solc.overlay
25+
];
26+
};
1527
# minimem development shell
1628
minimumEVMDevInputs = with pkgs; [
1729
# for nodejs ecosystem
1830
yarn
19-
nodejs-16_x
31+
nodejs-18_x
2032
# for solidity development
21-
foundry.defaultPackage.${system}
33+
foundry-bin
34+
solc_0_8_19
2235
];
2336
# additional tooling for whitehat hackers
2437
whitehatInputs = with pkgs; [
@@ -77,8 +90,8 @@
7790
};
7891
devShells.full = with pkgs; mkShell {
7992
buildInputs = minimumEVMDevInputs
80-
++ whitehatInputs
81-
++ specInputs;
93+
++ whitehatInputs
94+
++ specInputs;
8295
};
8396
devShells.ci-spec-ghc925 = ci-spec "ghc925";
8497
devShells.ci-spec-ghc944 = ci-spec "ghc944";

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"prepare": "yarn git:submodule:init",
1313
"git:submodule:init": "git submodule update --init --recursive",
1414
"git:submodule:update": "git submodule update --recursive",
15-
"git:submodule:sync": "git submodule update --remote --recursive;git submodule sync",
15+
"git:submodule:sync": "git submodule update --remote --recursive;git submodule sync --recursive",
1616
"git:submodule:deinit": "git submodule deinit --all --force",
1717
"lint": "run-s lint:*",
1818
"lint:shellcheck": "tasks/shellcheck-all-tasks.sh",

0 commit comments

Comments
 (0)