Skip to content
Snippets Groups Projects
Commit 83fdc8b7 authored by Wouter Deconinck's avatar Wouter Deconinck
Browse files

chore: switch geant4 to qt6

parent bf6fcfc4
No related branches found
No related tags found
1 merge request!969chore: switch geant4 to qt6
Pipeline #99034 passed
Stage: status-pending
Stage: config
Stage: base
Stage: eic
Stage: deploy
Stage: benchmarks
Stage: finalize
Stage: status-report
Pipeline: reconstruction_benchmarks

#99037

    Pipeline: physics_benchmarks

    #99036

      Pipeline: detector_benchmarks

      #99035

        Hide whitespace changes
        Inline Side-by-side
        spack-environment/packages.yaml
        + 7
        − 0
        View file @ 83fdc8b7
        ...@@ -367,10 +367,17 @@ packages: ...@@ -367,10 +367,17 @@ packages:
        py-yapf: py-yapf:
        require: require:
        - '@0.30.0' - '@0.30.0'
        qmake:
        require:
        - qt-base
        qt: qt:
        require: require:
        - '@5.15.12' - '@5.15.12'
        - +opengl - +opengl
        qt-base:
        require:
        - '@6.7.2'
        - +opengl
        root: root:
        require: require:
        - '@6.30.02' - '@6.30.02'
        ......
        spack-environment/xl/spack.yaml
        + 1
        − 1
        View file @ 83fdc8b7
        ...@@ -38,7 +38,7 @@ spack: ...@@ -38,7 +38,7 @@ spack:
        - fmt - fmt
        - gaudi - gaudi
        - gdb - gdb
        - geant4 - geant4 +opengl
        - graphviz - graphviz
        - hepmc3 - hepmc3
        - heppdt - heppdt
        ......
        spack.sh
        + 6
        − 0
        View file @ 83fdc8b7
        ...@@ -18,6 +18,9 @@ f73d7d2dce226857cbc774e942454bad2992969e ...@@ -18,6 +18,9 @@ f73d7d2dce226857cbc774e942454bad2992969e
        cbab451c1a342523ed75e9be1098615a597a9b59 cbab451c1a342523ed75e9be1098615a597a9b59
        4fe5f35c2fff6288e4c05e5946798ad2191a2c40 4fe5f35c2fff6288e4c05e5946798ad2191a2c40
        4c60deb9921ff2cbbfa6771f4f63ff812a8a5840 4c60deb9921ff2cbbfa6771f4f63ff812a8a5840
        b894acf1fca8eb5cc52d2267b0c4c187065998c0
        8b45fa089e24c6ab7de2eaf614977369e69daa54
        2d8ca8af6932dfd50204d1e4f6fe587dec7beef5
        --- ---
        ## Optional hash table with comma-separated file list ## Optional hash table with comma-separated file list
        read -r -d '' SPACK_CHERRYPICKS_FILES <<- \ read -r -d '' SPACK_CHERRYPICKS_FILES <<- \
        ...@@ -35,3 +38,6 @@ read -r -d '' SPACK_CHERRYPICKS_FILES <<- \ ...@@ -35,3 +38,6 @@ read -r -d '' SPACK_CHERRYPICKS_FILES <<- \
        ## cbab451c1a342523ed75e9be1098615a597a9b59: dd4hep: Add version 1.29 ## cbab451c1a342523ed75e9be1098615a597a9b59: dd4hep: Add version 1.29
        ## 4fe5f35c2fff6288e4c05e5946798ad2191a2c40: xrootd: add v5.7.0 ## 4fe5f35c2fff6288e4c05e5946798ad2191a2c40: xrootd: add v5.7.0
        ## 4c60deb9921ff2cbbfa6771f4f63ff812a8a5840: xrootd: add github as secondary url to avoid SSL issues ## 4c60deb9921ff2cbbfa6771f4f63ff812a8a5840: xrootd: add github as secondary url to avoid SSL issues
        ## b894acf1fca8eb5cc52d2267b0c4c187065998c0: geant4: add v11.2.2, incl g4ndl v4.7.1
        ## 8b45fa089e24c6ab7de2eaf614977369e69daa54: geant4: support Qt5 and Qt6
        ## 2d8ca8af6932dfd50204d1e4f6fe587dec7beef5: qt-*: add v6.7.1, v6.7.2
        0% or .
        You are about to add 0 people to the discussion. Proceed with caution.
        Finish editing this message first!
        Please register or to comment