Skip to content

Commit 8d5888b

Browse files
authored
Merge pull request crytic#1427 from crytic/nixpkgs
flake: update nixpkgs, foundry, bitwuzla
2 parents 912fe38 + ea87657 commit 8d5888b

File tree

3 files changed

+13
-34
lines changed

3 files changed

+13
-34
lines changed

flake.lock

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

flake.nix

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,27 +2,23 @@
22
inputs = {
33
nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
44
flake-utils.url = "github:numtide/flake-utils";
5-
foundry.url = "github:shazow/foundry.nix/47f8ae49275eeff9bf0526d45e3c1f76723bb5d3";
5+
foundry.url = "github:shazow/foundry.nix/stable";
66
flake-compat = {
77
url = "github:edolstra/flake-compat";
88
flake = false;
99
};
10-
nix-bundle-exe = {
11-
url = "github:3noch/nix-bundle-exe";
12-
flake = false;
13-
};
1410
solc-pkgs = {
1511
url = "github:hellwolf/solc.nix";
1612
inputs.nixpkgs.follows = "nixpkgs";
1713
};
1814
};
1915

20-
outputs = { self, nixpkgs, flake-utils, nix-bundle-exe, solc-pkgs, foundry, ... }:
16+
outputs = { self, nixpkgs, flake-utils, solc-pkgs, foundry, ... }:
2117
flake-utils.lib.eachDefaultSystem (system:
2218
let
2319
pkgs = import nixpkgs {
2420
inherit system;
25-
overlays = [solc-pkgs.overlay];
21+
overlays = [solc-pkgs.overlay foundry.overlay];
2622
};
2723

2824
# prefer musl on Linux, static glibc + threading does not work properly
@@ -169,7 +165,7 @@
169165
packages = [
170166
(echidna pkgs)
171167
slither-analyzer
172-
foundry.defaultPackage.${system}
168+
foundry-bin
173169
bitwuzla
174170
cvc5
175171
z3

stack.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
resolver: lts-23.21
2-
# matching https://github.com/NixOS/nixpkgs/blob/322d8a3c6940039f7cff179a8b09c5d7ca06359d/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml#L1
1+
resolver: lts-23.24
2+
# matching https://github.com/NixOS/nixpkgs/blob/97eb7ee0da337d385ab015a23e15022c865be75c/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml#L1
33

44
packages:
55
- '.'

0 commit comments

Comments
 (0)