Skip to content

Update flake.lock + Remove x86_64-darwin support + Updated github os strategy matrix #31

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hellwolf merged 5 commits into from
Aug 11, 2026
Merged

Update flake.lock + Remove x86_64-darwin support + Updated github os strategy matrix #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
cec83f9
update flake.lock
hellwolf Aug 11, 2026
b321355
remove x86_64-darwin support
hellwolf Aug 11, 2026
00b9af3
fix nix flake overlay field
hellwolf Aug 11, 2026
f720186
github workflow: updated strategy.matrix.os
hellwolf Aug 11, 2026
36a89a3
Merge branch 'master' into update-flake-lock
hellwolf Aug 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,9 @@ jobs:
strategy:
matrix:
# https://docs.github.com/en/actions/using-github-hosted-runners/about-github-hosted-runners/about-github-hosted-runners
os: [ubuntu-latest, ubuntu-24.04-arm, macos-14, macos-15, macos-15-intel]
os: [ ubuntu-latest, ubuntu-24.04-arm, ubuntu-26.04
, macos-latest, macos-14, macos-15, macos-26
]
fail-fast: false
runs-on: ${{ matrix.os }}
permissions:
Expand Down
14 changes: 7 additions & 7 deletions flake.lock
View file
Open in desktop

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

1 change: 0 additions & 1 deletion flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
[
"x86_64-linux"
"aarch64-linux"
"x86_64-darwin"
"aarch64-darwin"
]
(
Expand Down
1 change: 0 additions & 1 deletion mk-solc-static-pkg.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ let
{
x86_64-linux = "solc-static-linux";
aarch64-linux = "solc-static-linux-arm";
x86_64-darwin = "solc-macos-amd64";
aarch64-darwin = "solc-macos-aarch64";
}
# We musnt' throw here, since nixos-rebuild seems not liking it.
Expand Down
6 changes: 0 additions & 6 deletions test/flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
[
"x86_64-linux"
"aarch64-linux"
"x86_64-darwin"
"aarch64-darwin"
]
(
Expand Down Expand Up @@ -49,11 +48,6 @@
]
else if system == "aarch64-linux" then
[ solc_0_8_31 ]
else if system == "x86_64-darwin" then
[
solc_0_4_11
solc_0_7_6
]
else if system == "aarch64-darwin" then
[ solc_0_8_5 ]
else
Expand Down