Skip to content

Commit

Permalink
fix something
Browse files Browse the repository at this point in the history
  • Loading branch information
hellwolf committed May 25, 2024
1 parent 845bfc0 commit 1f005e4
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 19 deletions.
20 changes: 9 additions & 11 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,9 @@
solc-macos-amd64-list-json,
}:
let
solc-macos-amd64-list = (builtins.fromJSON (builtins.readFile solc-macos-amd64-list-json));
mk-solc-pkgs = pkgs: import ./mk-solc-pkgs.nix (pkgs // { inherit solc-macos-amd64-list; });
solc-macos-amd64-list = builtins.fromJSON (builtins.readFile solc-macos-amd64-list-json);
solc-pkgs-overlay =
final: prev: import ./mk-solc-pkgs.nix (prev // { inherit solc-macos-amd64-list; });
in
flake-utils.lib.eachSystem
[
Expand All @@ -31,22 +32,19 @@
(
system:
let
pkgs = import nixpkgs { inherit system; };
solcPkgs = mk-solc-pkgs pkgs;
pkgs = import nixpkgs {
inherit system;
overlays = [ solc-pkgs-overlay ];
};
in
{
# assorted solc packages
packages = solcPkgs;

# default shell with the latest solc compiler
devShells.default = pkgs.mkShell { buildInputs = [ solcPkgs.solc_0_8_19 ]; };
# shell with all solc compilers
devShells.all = pkgs.mkShell { buildInputs = builtins.attrValues solcPkgs; };
devShells.default = pkgs.mkShell { buildInputs = [ pkgs.solc_0_8_19 ]; };
}
)
// {
# the overlay for nixpkgs
overlay = final: prev: mk-solc-pkgs prev;
overlay = solc-pkgs-overlay;

# make a package with the symlink 'solc' to the selected solc
mkDefault =
Expand Down
15 changes: 7 additions & 8 deletions test/flake.lock

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

0 comments on commit 1f005e4

Please sign in to comment.