Skip to content

Commit dec8115

Browse files
native aarch64 support
1 parent 6c57d4f commit dec8115

File tree

13 files changed

+1947
-16
lines changed

13 files changed

+1947
-16
lines changed

compiler/ghc/default.nix

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
# build-tools
99
, bootPkgs
10-
, autoconf, automake, coreutils, fetchurl, fetchpatch, perl, python3, m4, sphinx
10+
, autoconf, automake, coreutils, fetchurl, fetchpatch, perl, python3, m4, sphinx, numactl
1111
, autoreconfHook
1212
, bash
1313

@@ -116,7 +116,8 @@ let
116116
libDeps = platform: stdenv.lib.optional enableTerminfo [ ncurses ]
117117
++ [targetLibffi]
118118
++ stdenv.lib.optional (!enableIntegerSimple) gmp
119-
++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv;
119+
++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv
120+
++ stdenv.lib.optional platform.isLinux numactl;
120121

121122
toolsForTarget =
122123
if hostPlatform == buildPlatform then

compiler/old-ghc-nix/old-ghc-nix.json

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
{
2-
"url": "https://github.com/angerman/old-ghc-nix",
3-
"rev": "bf640c1a3f55203bb7492a366c6492ff3c211332",
4-
"date": "2020-02-27T19:53:36+08:00",
5-
"sha256": "050g06911rpmvn66y5lmnszswz17flw3b979imdchc2apji6a1sm",
2+
"url": "https://github.com/traviswhitaker/old-ghc-nix",
3+
"rev": "0d136da6e48de6d1256c8aa2b281662e93f9e486",
4+
"sha256": "1cp6aksb6ldgjb5zyqikyjrjij79n9z7wd86migph0wp19vmszkf",
65
"fetchSubmodules": false
76
}

lib/call-cabal-project-to-nix.nix

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -266,6 +266,7 @@ let
266266
executable = true;
267267
destination = "/bin/${ghc.targetPrefix}ghc";
268268
text = ''
269+
#!${pkgs.buildPackages.runtimeShell}
269270
if [ "'$*'" == "'--numeric-version'" ]; then cat ${dummy-ghc-data}/ghc/numeric-version;
270271
elif [ "'$*'" == "'--supported-languages'" ]; then cat ${dummy-ghc-data}/ghc/supported-languages;
271272
elif [ "'$*'" == "'--print-global-package-db'" ]; then echo $out/dumby-db;
@@ -283,6 +284,7 @@ let
283284
executable = true;
284285
destination = "/bin/${ghc.targetPrefix}ghc-pkg";
285286
text = ''
287+
#!${pkgs.buildPackages.runtimeShell}
286288
if [ "'$*'" == "'--version'" ]; then cat ${dummy-ghc-data}/ghc-pkg/version;
287289
elif [ "'$*'" == "'dump --global -v0'" ]; then cat ${dummy-ghc-data}/ghc-pkg/dump-global;
288290
else

materialized/dummy-ghc/ghc-8.8.3-aarch64-linux/ghc-pkg/dump-global

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

materialized/dummy-ghc/ghc-8.8.3-aarch64-linux/ghc-pkg/version

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

materialized/dummy-ghc/ghc-8.8.3-aarch64-linux/ghc/info

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

materialized/dummy-ghc/ghc-8.8.3-aarch64-linux/ghc/numeric-version

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

materialized/dummy-ghc/ghc-8.8.3-aarch64-linux/ghc/supported-languages

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

nix-tools/regenerate.nix

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,11 @@ in
5454
# "stm" "terminfo"
5555
];
5656
}];
57-
}).nix-tools.components.exes.plan-to-nix; in
57+
}).nix-tools.components.exes.plan-to-nix;
58+
bootstrap = if pkgs.targetPlatform.isAarch64
59+
then haskell-nix.bootstrap.compiler.ghc882
60+
else haskell-nix.bootstrap.compiler.ghc844;
61+
in
5862
with builtins;
5963
with stdenv.lib;
6064
writeShellScriptBin "update-nix-tools" ''

0 commit comments

Comments
 (0)