Skip to content

Commit 5029339

Browse files
committed

File tree

2 files changed

+14
-2
lines changed

2 files changed

+14
-2
lines changed

.github/workflows/binaries.yml

+5
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@ jobs:
1414
- os: ubuntu-latest
1515
system: x86_64-linux
1616
attr: native
17+
- os: ubuntu-24.04-arm
18+
system: aarch64-linux
19+
attr: native
1720
- os: macOS-latest
1821
system: aarch64-darwin
1922
attr: native
@@ -84,6 +87,8 @@ jobs:
8487
include:
8588
- os: ubuntu-latest
8689
system: x86_64-linux
90+
- os: ubuntu-24.04-arm
91+
system: aarch64-linux
8792
- os: macOS-latest
8893
system: aarch64-darwin
8994
- os: macOS-latest

flake.nix

+9-2
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,14 @@
7777
};
7878
ormoluExe = hsPkgs: hsPkgs.hsPkgs.ormolu.components.exes.ormolu;
7979
linuxWindows = {
80-
native = ormoluExe hsPkgs.projectCross.musl64;
80+
native =
81+
let
82+
musl =
83+
if system == "aarch64-linux"
84+
then "aarch64-multiplatform-musl"
85+
else "musl64";
86+
in
87+
ormoluExe hsPkgs.projectCross.${musl};
8188
windows = ormoluExe hsPkgs.projectCross.mingwW64;
8289
};
8390
macOS.native = pkgs.runCommand "ormolu-macOS"
@@ -98,7 +105,7 @@
98105
'';
99106
in
100107
lib.recurseIntoAttrs
101-
(lib.optionalAttrs (system == "x86_64-linux") linuxWindows
108+
(lib.optionalAttrs pkgs.hostPlatform.isLinux linuxWindows
102109
// lib.optionalAttrs pkgs.hostPlatform.isDarwin macOS);
103110

104111
pre-commit-check = inputs.pre-commit-hooks.lib.${system}.run {

0 commit comments

Comments
 (0)