Merge pull request #228 from veprbl/pr/aarch64-linux

build.yml: enable build on aarch64-linux
veprbl · Jan 28, 2025 · 63478ae · 63478ae
2 parents 164ba68 + 7050868
commit 63478ae
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 5 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -13,6 +13,7 @@ jobs:
     strategy:
       matrix:
         arch:
+          - { name: 'aarch64-linux', runs-on: ubuntu-24.04-arm }
           - { name: 'x86_64-linux', runs-on: ubuntu-latest }
           - { name: 'x86_64-darwin', runs-on: macos-latest }
     name: ${{ matrix.arch.name }}

diff --git a/flake.nix b/flake.nix
@@ -58,7 +58,7 @@
     let
 
       inherit (nixpkgs) lib;
-      supportedSystems = [ "x86_64-linux" "x86_64-darwin" ];
+      supportedSystems = [ "aarch64-linux" "x86_64-linux" "x86_64-darwin" ];
 
       pkgsFor = system: import nixpkgs {
         inherit system;
@@ -133,6 +133,7 @@
               '';
             };
 
+          } // lib.optionalAttrs (system != "aarch64-linux") {
             fun4all-env = pkgs.mkShell rec {
               buildInputs = with self.packages.${system}; [
                 fun4all

diff --git a/overlay.nix b/overlay.nix
@@ -81,6 +81,7 @@ final: prev: with final; {
       "-DCMAKE_CXX_STANDARD=20"
       "-DGEANT4_BUILD_TLS_MODEL=global-dynamic"
     ];
+    meta.broken = false;
   });
 
   genfit = callPackage pkgs/genfit {};

diff --git a/pkgs/fun4all/default.nix b/pkgs/fun4all/default.nix
@@ -692,6 +692,9 @@ sphenix_packages = with extra_deps; let geant4 = extra_deps.geant4_10_6_2; in en
       rm "$out/nix-support/setup-hook" || true
       substituteAll "$setupHook" "$out/nix-support/setup-hook"
     '';
+
+    # hide from the package set as Vc is not supported on aarch64-linux
+    meta.broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64);
   };
 });
 

diff --git a/pkgs/vecgeom/default.nix b/pkgs/vecgeom/default.nix
@@ -10,14 +10,14 @@
 
 stdenv.mkDerivation rec {
   pname = "vecgeom";
-  version = "1.2.1";
+  version = "1.2.10";
 
   src = fetchFromGitLab {
     domain = "gitlab.cern.ch";
     owner = "VecGeom";
     repo = "VecGeom";
-    rev = "v${version}";
-    hash = "sha256-T5H4e66H64VOKqcz30tsezFME3x4lgrmbPAkOSfLJ8U=";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-sQ6PE4PENjLuwYOn+ZHr2RtmA/+WN9ZETnq+kRr1TRQ=";
   };
 
   nativeBuildInputs = [
@@ -36,7 +36,8 @@ stdenv.mkDerivation rec {
     "-DVECGEOM_GEANT4=ON"
   ];
 
-  doCheck = true;
+  # TestPolyhedra and TestSphere failing on aarch64-linux
+  doCheck = !(stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64);
 
   meta = with lib; {
     description = "The vectorized geometry library for particle-detector simulation";