about summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorJohn Ericson <John.Ericson@Obsidian.Systems>2018-01-04 19:49:00 -0500
committerJohn Ericson <John.Ericson@Obsidian.Systems>2018-01-21 23:31:04 -0500
commitb612597c3d549b50f71f616f2acaa5a1ae0cfa52 (patch)
tree949fa6bde515eb3104c8d8d62131c41d885249e5 /pkgs
parent81553124cf32e9d515da5f1c2f1b07e09886d8cf (diff)
downloadnixlib-b612597c3d549b50f71f616f2acaa5a1ae0cfa52.tar
nixlib-b612597c3d549b50f71f616f2acaa5a1ae0cfa52.tar.gz
nixlib-b612597c3d549b50f71f616f2acaa5a1ae0cfa52.tar.bz2
nixlib-b612597c3d549b50f71f616f2acaa5a1ae0cfa52.tar.lz
nixlib-b612597c3d549b50f71f616f2acaa5a1ae0cfa52.tar.xz
nixlib-b612597c3d549b50f71f616f2acaa5a1ae0cfa52.tar.zst
nixlib-b612597c3d549b50f71f616f2acaa5a1ae0cfa52.zip
release-cross: Add a test for Haskell on Raspberry Pi and "Android"
Hello World with ghcHEAD. ghc822 to come after some patches.

Android will be turned into real Android...later.
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/top-level/release-cross.nix7
1 files changed, 7 insertions, 0 deletions
diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix
index f6b2ecfb5dbe..69982330965d 100644
--- a/pkgs/top-level/release-cross.nix
+++ b/pkgs/top-level/release-cross.nix
@@ -117,8 +117,15 @@ in
     patchelf = nativePlatforms;
     buildPackages.binutils = nativePlatforms;
     mpg123 = nativePlatforms;
+    haskell.packages.ghcHEAD.hello = nativePlatforms;
+    haskell.packages.ghc822.hello = nativePlatforms;
   });
 
+  /* Linux on Aarch64 (TODO make android for real)  */
+  android = mapTestOnCross lib.systems.examples.aarch64-multiplatform (linuxCommon // {
+    haskell.packages.ghcHEAD.hello = nativePlatforms;
+    haskell.packages.ghc822.hello = nativePlatforms;
+  });
 
   /* Cross-built bootstrap tools for every supported platform */
   bootstrapTools = let