Skip to content
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

build.yml: enable build on aarch64-linux #228

Merged
merged 5 commits into from
Jan 28, 2025
Merged

build.yml: enable build on aarch64-linux #228

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
2794057
geant4: set `meta.broken` to `false`
veprbl Jan 28, 2025
f245abe
vecgeom: 1.2.1 -> 1.2.10
veprbl Jan 28, 2025
072eb49
vecgeom: don't check on aarch64-linux
veprbl Jan 28, 2025
950c1d5
fun4all: disable on aarch64-linux
veprbl Jan 28, 2025
7050868
build.yml: enable build on aarch64-linux
veprbl Jan 17, 2025
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
1 change: 1 addition & 0 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
3 changes: 2 additions & 1 deletion flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -133,6 +133,7 @@
'';
};

} // lib.optionalAttrs (system != "aarch64-linux") {
fun4all-env = pkgs.mkShell rec {
buildInputs = with self.packages.${system}; [
fun4all
Expand Down
1 change: 1 addition & 0 deletions overlay.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {};
Expand Down
3 changes: 3 additions & 0 deletions pkgs/fun4all/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
};
});

Expand Down
9 changes: 5 additions & 4 deletions pkgs/vecgeom/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = [
Expand All @@ -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";
Expand Down