From 706fa3ea9240bfa3d41fd50022e2e32fcb9e551a Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sun, 22 Sep 2024 00:14:33 +0200
Subject: [PATCH] python312Packages.mhcflurry: 2.1.1 -> 2.1.3

Diff: https://github.com/openvax/mhcflurry/compare/refs/tags/v2.1.1...v2.1.3

Changelog: https://github.com/openvax/mhcflurry/releases/tag/v2.1.3
---
 .../python-modules/mhcflurry/default.nix      | 22 ++++++++++++-------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/mhcflurry/default.nix b/pkgs/development/python-modules/mhcflurry/default.nix
index 68b4624125a4..29c00af47c23 100644
--- a/pkgs/development/python-modules/mhcflurry/default.nix
+++ b/pkgs/development/python-modules/mhcflurry/default.nix
@@ -1,29 +1,34 @@
 {
-  appdirs,
+  lib,
   buildPythonPackage,
   fetchFromGitHub,
+
+  # dependencies
+  appdirs,
   keras,
-  lib,
   mhcgnomes,
-  nose,
   pandas,
-  pytestCheckHook,
   pyyaml,
   scikit-learn,
   tensorflow,
+  tf-keras,
   tqdm,
+
+  # tests
+  nose,
+  pytestCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "mhcflurry";
-  version = "2.1.1";
+  version = "2.1.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "openvax";
     repo = "mhcflurry";
     rev = "refs/tags/v${version}";
-    hash = "sha256-absIKvcFo6I1Uu0t+l8OLOU/AQ4kD295P4+KVwMAWMc=";
+    hash = "sha256-Xz3Myd+pifNQMTH1BC2qsQEy7UorYNQNj+7ysMVmCOs=";
   };
 
   # keras and tensorflow are not in the official setup.py requirements but are required for the CLI utilities to run.
@@ -35,6 +40,7 @@ buildPythonPackage rec {
     pyyaml
     scikit-learn
     tensorflow
+    tf-keras
     tqdm
   ];
 
@@ -88,7 +94,7 @@ buildPythonPackage rec {
     changelog = "https://github.com/openvax/mhcflurry/releases/tag/v${version}";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ samuela ];
-    # ModuleNotFoundError: No module named 'keras.api._v2' as tensorflow is too outdated
-    broken = true;
+    # Requires a recent version of tensorflow
+    broken = lib.versionOlder tensorflow.version "2.15.0";
   };
 }