diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-11-10 06:01:22 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-10 06:01:22 +0000 |
| commit | b55905ceb6e94a992effc7831a55372f913fcd71 (patch) | |
| tree | a3219888b8bd4a0b01926f1bd0309e8c68b98172 /pkgs/applications/science | |
| parent | 3f616fad02c82853a8e6e3cf8fd3aea95945f70e (diff) | |
| parent | f3565a2c088883636f198550eac349ed82c6a2b3 (diff) | |
| download | nixpkgs-b55905ceb6e94a992effc7831a55372f913fcd71.tar nixpkgs-b55905ceb6e94a992effc7831a55372f913fcd71.tar.gz nixpkgs-b55905ceb6e94a992effc7831a55372f913fcd71.tar.bz2 nixpkgs-b55905ceb6e94a992effc7831a55372f913fcd71.tar.lz nixpkgs-b55905ceb6e94a992effc7831a55372f913fcd71.tar.xz nixpkgs-b55905ceb6e94a992effc7831a55372f913fcd71.tar.zst nixpkgs-b55905ceb6e94a992effc7831a55372f913fcd71.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/science')
| -rw-r--r-- | pkgs/applications/science/misc/root/5.nix | 3 | ||||
| -rw-r--r-- | pkgs/applications/science/misc/root/root5-python311-fix.patch | 17 |
2 files changed, 20 insertions, 0 deletions
diff --git a/pkgs/applications/science/misc/root/5.nix b/pkgs/applications/science/misc/root/5.nix index 4a8411cd34f..2d830e3d101 100644 --- a/pkgs/applications/science/misc/root/5.nix +++ b/pkgs/applications/science/misc/root/5.nix @@ -64,6 +64,9 @@ stdenv.mkDerivation rec { url = "https://github.com/root-project/root/commit/c75458024082de0cc35b45505c652b8460a9e71b.patch"; sha256 = "sha256-A5zEjQE9OGPFp/L1HUs4NIdxQMRiwbwCRNWOLN2ENrM="; }) + # Backport Python 3.11 fix to v5 from v6.26 + # https://github.com/root-project/root/commit/484deb056dacf768aba4954073b41105c431bffc + ./root5-python311-fix.patch ]; # https://github.com/root-project/root/issues/13216 diff --git a/pkgs/applications/science/misc/root/root5-python311-fix.patch b/pkgs/applications/science/misc/root/root5-python311-fix.patch new file mode 100644 index 00000000000..3005b3a73f9 --- /dev/null +++ b/pkgs/applications/science/misc/root/root5-python311-fix.patch @@ -0,0 +1,17 @@ +diff --git a/bindings/pyroot/src/MethodProxy.cxx b/bindings/pyroot/src/MethodProxy.cxx +--- a/bindings/pyroot/src/MethodProxy.cxx ++++ b/bindings/pyroot/src/MethodProxy.cxx +@@ -4,10 +4,10 @@ + // Bindings + #include "PyROOT.h" + #include "structmember.h" // from Python +-#if PY_VERSION_HEX >= 0x02050000 +-#include "code.h" // from Python +-#else ++#if PY_VERSION_HEX < 0x02050000 + #include "compile.h" // from Python ++#elif PY_VERSION_HEX < 0x030b0000 ++#include "code.h" // from Python + #endif + #ifndef CO_NOFREE + // python2.2 does not have CO_NOFREE defined |