From 47f782c6d3f3f522c4f9382442d5e61a076e33b2 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Tue, 20 May 2025 01:13:33 +0200 Subject: [PATCH 1/5] python312Packages.keras: 3.9.2 -> 3.10.0 Diff: https://github.com/keras-team/keras/compare/refs/tags/v3.9.2...refs/tags/v3.10.0 Changelog: https://github.com/keras-team/keras/releases/tag/v3.10.0 --- pkgs/development/python-modules/keras/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/keras/default.nix b/pkgs/development/python-modules/keras/default.nix index 7d76e6eaf307..abc12a33d45e 100644 --- a/pkgs/development/python-modules/keras/default.nix +++ b/pkgs/development/python-modules/keras/default.nix @@ -35,14 +35,14 @@ buildPythonPackage rec { pname = "keras"; - version = "3.9.2"; + version = "3.10.0"; pyproject = true; src = fetchFromGitHub { owner = "keras-team"; repo = "keras"; tag = "v${version}"; - hash = "sha256-mxQHqApyxO57zo/lK8p9xWEdEgkXF89yX/+pPBUlbwE="; + hash = "sha256-N0RlXnmSYJvD4/a47U4EjMczw1VIyereZoPicjgEkAI="; }; build-system = [ From 85759588bc6b31628f2f0ac517691d5ed2c6ef25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=A9tan=20Lepage?= <33058747+GaetanLepage@users.noreply.github.com> Date: Sun, 3 Aug 2025 18:47:25 +0200 Subject: [PATCH 2/5] python3Packages.keras: 3.10.0 -> 3.11.1 (#429693) Diff: https://github.com/keras-team/keras/compare/refs/tags/v3.10.0...refs/tags/v3.11.1 Changelog: https://github.com/keras-team/keras/releases/tag/v3.11.1 --- pkgs/development/python-modules/keras/default.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/keras/default.nix b/pkgs/development/python-modules/keras/default.nix index abc12a33d45e..df283b044352 100644 --- a/pkgs/development/python-modules/keras/default.nix +++ b/pkgs/development/python-modules/keras/default.nix @@ -35,14 +35,14 @@ buildPythonPackage rec { pname = "keras"; - version = "3.10.0"; + version = "3.11.1"; pyproject = true; src = fetchFromGitHub { owner = "keras-team"; repo = "keras"; tag = "v${version}"; - hash = "sha256-N0RlXnmSYJvD4/a47U4EjMczw1VIyereZoPicjgEkAI="; + hash = "sha256-jyNOL5u+XVVqChD7Fs3yJCcW14bTvitiQa4H4DTeja0="; }; build-system = [ @@ -82,9 +82,10 @@ buildPythonPackage rec { ]; disabledTests = [ - # NameError: name 'MockRemat' is not defined - # https://github.com/keras-team/keras/issues/21126 - "test_functional_model_with_remat" + # Require unpackaged `grain` + "test_fit_with_data_adapter_grain_dataloader" + "test_fit_with_data_adapter_grain_datast" + "test_fit_with_data_adapter_grain_datast_with_len" # Tries to install the package in the sandbox "test_keras_imports" @@ -94,6 +95,9 @@ buildPythonPackage rec { ]; disabledTestPaths = [ + # Require unpackaged `grain` + "keras/src/trainers/data_adapters/grain_dataset_adapter_test.py" + # These tests succeed when run individually, but crash within the full test suite: # ImportError: /nix/store/4bw0x7j3wfbh6i8x3plmzknrdwdzwfla-abseil-cpp-20240722.1/lib/libabsl_cord_internal.so.2407.0.0: # undefined symbol: _ZN4absl12lts_2024072216strings_internal13StringifySink6AppendESt17basic_string_viewIcSt11char_traitsIcEE From d523b9b166775bc99ad5dc0e7ca18d5048783305 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 13 Aug 2025 22:20:24 +0200 Subject: [PATCH 3/5] python3Packages.keras: 3.11.1 -> 3.11.2 Diff: https://github.com/keras-team/keras/compare/v3.11.1...v3.11.2 Changelog: https://github.com/keras-team/keras/releases/tag/v3.11.2 --- pkgs/development/python-modules/keras/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/keras/default.nix b/pkgs/development/python-modules/keras/default.nix index df283b044352..c9ab51d154e9 100644 --- a/pkgs/development/python-modules/keras/default.nix +++ b/pkgs/development/python-modules/keras/default.nix @@ -35,14 +35,14 @@ buildPythonPackage rec { pname = "keras"; - version = "3.11.1"; + version = "3.11.2"; pyproject = true; src = fetchFromGitHub { owner = "keras-team"; repo = "keras"; tag = "v${version}"; - hash = "sha256-jyNOL5u+XVVqChD7Fs3yJCcW14bTvitiQa4H4DTeja0="; + hash = "sha256-VRza7ElCPjdMeo4LH0WSBD8WdzxojJStGXlf1pbP3b0="; }; build-system = [ From 541cb55ef7135cc057571938429e688a9542f5c7 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 22 Aug 2025 23:41:09 +0200 Subject: [PATCH 4/5] python3Packages.keras: 3.11.2 -> 3.11.3 Diff: https://github.com/keras-team/keras/compare/v3.11.2...v3.11.3 Changelog: https://github.com/keras-team/keras/releases/tag/v3.11.3 --- pkgs/development/python-modules/keras/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/keras/default.nix b/pkgs/development/python-modules/keras/default.nix index c9ab51d154e9..b17acee473bd 100644 --- a/pkgs/development/python-modules/keras/default.nix +++ b/pkgs/development/python-modules/keras/default.nix @@ -35,14 +35,14 @@ buildPythonPackage rec { pname = "keras"; - version = "3.11.2"; + version = "3.11.3"; pyproject = true; src = fetchFromGitHub { owner = "keras-team"; repo = "keras"; tag = "v${version}"; - hash = "sha256-VRza7ElCPjdMeo4LH0WSBD8WdzxojJStGXlf1pbP3b0="; + hash = "sha256-J/NPLR9ShKhvHDU0/NpUNp95RViS2KygqvnuDHdwiP0="; }; build-system = [ From 0545eb55593f63821d25075f6176fb9f7be6013b Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sun, 2 Nov 2025 21:31:51 +0000 Subject: [PATCH 5/5] python3Packages.keras: backport security patches - CVE-2025-12058 https://github.com/advisories/GHSA-mq84-hjqx-cwf2 Fix: https://github.com/keras-team/keras/commit/61ac8c1e51862c471dee7b49029c356f55531487 - CVE-2025-12060 https://github.com/advisories/GHSA-28jp-44vh-q42h Fix: https://github.com/keras-team/keras/commit/47fcb397ee4caffd5a75efd1fa3067559594e951 --- .../python-modules/keras/default.nix | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/pkgs/development/python-modules/keras/default.nix b/pkgs/development/python-modules/keras/default.nix index b17acee473bd..b446f972e157 100644 --- a/pkgs/development/python-modules/keras/default.nix +++ b/pkgs/development/python-modules/keras/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + fetchpatch2, # build-system setuptools, @@ -45,6 +46,27 @@ buildPythonPackage rec { hash = "sha256-J/NPLR9ShKhvHDU0/NpUNp95RViS2KygqvnuDHdwiP0="; }; + # The two following patches mitigate CVE breaches. + # The patches are part of the keras 3.12.0 release. + # We choose to backport the relevant commits instead of updating keras to 3.12.0 as this latest + # release includes breaking changes. + patches = [ + # Fixes CVE-2025-12058 + # https://github.com/advisories/GHSA-mq84-hjqx-cwf2 + (fetchpatch2 { + name = "patch-CVE-2025-12058"; + url = "https://github.com/keras-team/keras/commit/61ac8c1e51862c471dee7b49029c356f55531487.patch"; + hash = "sha256-tvWYde3AERV1w3gvQ70NNLo0xNxgyZFzf5LF48Axymg="; + }) + # Fixes CVE-2025-12060 + # https://github.com/advisories/GHSA-28jp-44vh-q42h + (fetchpatch2 { + name = "patch-CVE-2025-12060"; + url = "https://github.com/keras-team/keras/commit/47fcb397ee4caffd5a75efd1fa3067559594e951.patch"; + hash = "sha256-tiBRXGp+PHiY0VXCdcpmpq4PHORvREVpr/QfQcwqJdk="; + }) + ]; + build-system = [ setuptools ];