Commit 19a0534e authored by Gaetan Lepage's avatar Gaetan Lepage
Browse files
parent 6200c1ad
Loading
Loading
Loading
Loading
+2 −22
Original line number Diff line number Diff line
@@ -3,7 +3,6 @@
  stdenv,
  buildPythonPackage,
  fetchFromGitHub,
  fetchpatch2,

  # build-system
  hatchling,
@@ -23,35 +22,16 @@

buildPythonPackage rec {
  pname = "equinox";
  version = "0.13.0";
  version = "0.13.1";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "patrick-kidger";
    repo = "equinox";
    tag = "v${version}";
    hash = "sha256-zXgAuFGWKHShKodi9swnWIry4VU9s4pBhBRoK5KzaL0=";
    hash = "sha256-txgL5a+kKT28gAS8HianBgnnR+J25R2wrpRr8HEWCXA=";
  };

  patches = [
    # The following two patches have been merged upstream and should be removed when updating to the next release
    # They fix the incompatibilities with jax>=0.7.0

    # https://github.com/patrick-kidger/equinox/pull/1086
    (fetchpatch2 {
      name = "remove-deprecated-batching-NotMapped";
      url = "https://github.com/patrick-kidger/equinox/commit/6a6a441ced2fe64191a087752f1c2e71a6ce39f1.patch";
      hash = "sha256-tzHFjMI3gAIh5MPkdbmzsky/oFjDEbOIkPGQMQ+gcQQ=";
    })

    # https://github.com/patrick-kidger/equinox/pull/1082
    (fetchpatch2 {
      name = "allow-creating-weak-references-to-flatten";
      url = "https://github.com/patrick-kidger/equinox/commit/62b3c94ad56bdb63524702b320e977d2d93dbe72.patch";
      hash = "sha256-c1FKCnC3/okuP2VJV4h7sPRYQeYJZSdzEG5ETL2M35k=";
    })
  ];

  # Relax speed constraints on tests that can fail on busy builders
  postPatch = ''
    substituteInPlace tests/test_while_loop.py \