summary refs log tree commit diff
path: root/pkgs/development
diff options
context:
space:
mode:
authorNick Cao <nickcao@nichi.co>2023-11-09 08:48:56 -0500
committerGitHub <noreply@github.com>2023-11-09 08:48:56 -0500
commit310a77c9d174458659f3b07b463e55d75daa4036 (patch)
treec93d8b0d72636493d407c3ad6821928801349400 /pkgs/development
parent325aae0b63ccf47efa7d9aa7fc8cb0885bff0179 (diff)
parentbf23d6743073e818d08c7ae1c73ec7ffcb008710 (diff)
Merge pull request #266430 from GaetanLepage/dalle-mini
python311Packages.dalle-mini: fix build
Diffstat (limited to 'pkgs/development')
-rw-r--r--pkgs/development/python-modules/dalle-mini/default.nix16
1 files changed, 10 insertions, 6 deletions
diff --git a/pkgs/development/python-modules/dalle-mini/default.nix b/pkgs/development/python-modules/dalle-mini/default.nix
index e50249dc7dd9a..0c768ba5dbe14 100644
--- a/pkgs/development/python-modules/dalle-mini/default.nix
+++ b/pkgs/development/python-modules/dalle-mini/default.nix
@@ -1,6 +1,7 @@
 { lib
 , buildPythonPackage
 , fetchPypi
+, fetchpatch
 , einops
 , emoji
 , flax
@@ -16,16 +17,20 @@
 buildPythonPackage rec {
   pname = "dalle-mini";
   version = "0.1.5";
+  format = "setuptools";
 
   src = fetchPypi {
     inherit pname version;
     hash = "sha256-k4XILjNNz0FPcAzwPEeqe5Lj24S2Y139uc9o/1IUS1c=";
   };
 
-  format = "setuptools";
-
-  buildInputs = [
-    jaxlib
+  # Fix incompatibility with the latest JAX versions
+  # See https://github.com/borisdayma/dalle-mini/pull/338
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/borisdayma/dalle-mini/pull/338/commits/22ffccf03f3e207731a481e3e42bdb564ceebb69.patch";
+      hash = "sha256-LIOyfeq/oVYukG+1rfy5PjjsJcjADCjn18x/hVmLkPY=";
+    })
   ];
 
   propagatedBuildInputs = [
@@ -34,6 +39,7 @@ buildPythonPackage rec {
     flax
     ftfy
     jax
+    jaxlib
     pillow
     transformers
     unidecode
@@ -49,7 +55,5 @@ buildPythonPackage rec {
     homepage = "https://github.com/borisdayma/dalle-mini";
     license = licenses.asl20;
     maintainers = with maintainers; [ r-burns ];
-    # incompatible with recent versions of JAX
-    broken = true;
   };
 }