From 0d935da204899907ac9aed26df128eda79313549 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Wed, 21 Jan 2026 20:41:45 -0500 Subject: [PATCH] geant4: 11.3.2 -> 11.4.0, switch to qt6 --- pkgs/by-name/ge/geant4/datasets.nix | 20 ++++++++++---------- pkgs/by-name/ge/geant4/package.nix | 10 +++++----- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/pkgs/by-name/ge/geant4/datasets.nix b/pkgs/by-name/ge/geant4/datasets.nix index 304c070a206c..87e9a9d62c6a 100644 --- a/pkgs/by-name/ge/geant4/datasets.nix +++ b/pkgs/by-name/ge/geant4/datasets.nix @@ -59,15 +59,15 @@ builtins.listToAttrs ( { pname = "G4EMLOW"; - version = "8.6.1"; - sha256 = "sha256-SpNYjSYIDOHTNrlPdvravkkF+48cuiQVeVAj1s2PSoo="; + version = "8.8"; + sha256 = "sha256-tgz9YxdvXRYQfiols1sjUVUDLRc110lnDKUP7eEmJM8="; envvar = "LE"; } { pname = "G4PhotonEvaporation"; - version = "6.1"; - sha256 = "sha256-X/wfmagdUMkCAYbVmHSvc8U7okwYQrO4KzGIIjuyRvI="; + version = "6.1.2"; + sha256 = "sha256-AhScCrkdiO4k54UyVYd345oGi5/N0ZkTYQH/WOY150I="; envvar = "LEVELGAMMA"; } @@ -87,8 +87,8 @@ builtins.listToAttrs ( { pname = "G4PARTICLEXS"; - version = "4.1"; - sha256 = "sha256-B64eBI6ayOf5H2aWSX3VW9UMzIItl68aC56SMhKm19E="; + version = "4.2"; + sha256 = "sha256-xSu/hqqlibeKuoCxarCt8QQeowDeU5WGW5f87m61WFE="; envvar = "PARTICLEXS"; } @@ -101,8 +101,8 @@ builtins.listToAttrs ( { pname = "G4INCL"; - version = "1.2"; - sha256 = "sha256-+ICxYHPuCpLXSU8ydqbVLU3h02d6DUx8WHADlu0OGn4="; + version = "1.3"; + sha256 = "sha256-5LPb5SrO9TU2RU4iRDCRIShDghvSNiju2EbSmVmfO/k="; envvar = "INCL"; } @@ -136,8 +136,8 @@ builtins.listToAttrs ( { pname = "G4CHANNELING"; - version = "1.0"; - sha256 = "sha256-ID48aZhMoJrNGBodMamw76+tS8EubGCPCwXmlRINZ/I="; + version = "2.0"; + sha256 = "sha256-ZiFZKIZE4Ht51/4JHvvrulK1lUaz3G9dKFuXatEvLQY="; envvar = "CHANNELING"; } diff --git a/pkgs/by-name/ge/geant4/package.nix b/pkgs/by-name/ge/geant4/package.nix index f62e4c0c4db6..f31bc82a0cf8 100644 --- a/pkgs/by-name/ge/geant4/package.nix +++ b/pkgs/by-name/ge/geant4/package.nix @@ -17,7 +17,7 @@ libxpm, motif, python3, - qt5, + qt6, soxt, xercesc, zlib, @@ -38,12 +38,12 @@ let in stdenv.mkDerivation (finalAttrs: { - version = "11.3.2"; + version = "11.4.0"; pname = "geant4"; src = fetchurl { url = "https://cern.ch/geant4-data/releases/geant4-v${finalAttrs.version}.tar.gz"; - hash = "sha256-iSrt10JSYqUKw9PHEX2BwMDaS0CMaIDbr1R4uTAeSIw="; + hash = "sha256-rWTJa4s9cSXnRruX9fVXee1ZRoGmpdY8JwJefJzvWPo="; }; # Fix broken paths in a .pc @@ -81,7 +81,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake ]; - propagatedNativeBuildInputs = lib.optionals enableQt [ qt5.wrapQtAppsHook ]; + propagatedNativeBuildInputs = lib.optionals enableQt [ qt6.wrapQtAppsHook ]; dontWrapQtApps = true; # no binaries buildInputs = @@ -112,7 +112,7 @@ stdenv.mkDerivation (finalAttrs: { libx11 ] ++ lib.optionals enableXM [ motif ] - ++ lib.optionals enableQt [ qt5.qtbase ]; + ++ lib.optionals enableQt [ qt6.qtbase ]; postFixup = '' substituteInPlace "$out"/bin/geant4.sh \